Initial TQt conversion

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-05 15:55:57 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-05 15:55:57 -0600
commit: 9ba04742771370f59740e32e11c5f3a1e6a1b70a (patch)
tree: c81c34dae2b3b1ea73801bf18a960265dc4207f7 /kjsembed
parent: 1a96c45b22d01378202d9dc7ed9c47acd30f966e (diff)
download: tdebindings-9ba04742771370f59740e32e11c5f3a1e6a1b70a.tar.gz
tdebindings-9ba04742771370f59740e32e11c5f3a1e6a1b70a.zip
303 files changed, 6949 insertions, 6949 deletions
diff --git a/kjsembed/Doxyfile b/kjsembed/Doxyfile
index 2fc6e61d..851bbe45 100644
--- a/kjsembed/Doxyfile
+++ b/kjsembed/Doxyfile
@@ -58,7 +58,7 @@ SHOW_USED_FILES        = YES
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
-QUIET                  = NO
+TTQUIET                  = NO
 WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
diff --git a/kjsembed/Doxyfile-Internal b/kjsembed/Doxyfile-Internal
index 1987988c..919e3d44 100644
--- a/kjsembed/Doxyfile-Internal
+++ b/kjsembed/Doxyfile-Internal
@@ -171,7 +171,7 @@ SHOW_INCLUDE_FILES     = YES
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
 # will interpret the first line (until the first dot) of a JavaDoc-style 
 # comment as the brief description. If set to NO, the JavaDoc 
-# comments  will behave just like the Qt-style comments (thus requiring an 
+# comments  will behave just like the Qt-style comments (thus retquiring an 
 # explict @brief command for a brief description.
 
 JAVADOC_AUTOBRIEF      = YES
@@ -265,10 +265,10 @@ SHOW_USED_FILES        = YES
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated 
+# 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.
 
-QUIET                  = NO
+TTQUIET                  = 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 
@@ -470,7 +470,7 @@ ENUM_VALUES_PER_LINE   = 4
 # If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
 # generated containing a tree-like index structure (just like the one that 
 # is generated for HTML Help). For this to work a browser that supports 
-# JavaScript and frames is required (for instance Netscape 4.0+ 
+# JavaScript and frames is retquired (for instance Netscape 4.0+ 
 # or Internet explorer 4.0+).
 
 GENERATE_TREEVIEW      = NO
diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am
index bdccbc04..3399ffb6 100644
--- a/kjsembed/Makefile.am
+++ b/kjsembed/Makefile.am
@@ -53,7 +53,7 @@ libkjsembed_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries) $(KDE_
 libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \
 			builtins/libkjsembedbuiltins.la \
 			qtbindings/libkjsembedqtbindings.la \
-			-lqui \
+			-ltqui \
 			$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \
 			$(LIB_KFILE) $(LIB_KHTML) -lkjs $(LIBSOCKET)
 
diff --git a/kjsembed/README b/kjsembed/README
index aa0ca684..8c8d6daa 100644
--- a/kjsembed/README
+++ b/kjsembed/README
@@ -33,11 +33,11 @@ JSConsoleWidget (KJSEmbed::JSConsoleWidget)
 kjs> console.childCount()
 4
 kjs> console.child(1)
-CmdEdit (QComboBox)
+CmdEdit (TQComboBox)
 kjs> console.child(2)
-RunButton (QPushButton)
+RunButton (TQPushButton)
 kjs> console.child("RunButton")
-RunButton (QPushButton)
+RunButton (TQPushButton)
 kjs> console.child("RunButton").text = "Go!"
 Go!
 kjs> console.caption = "Different Title"
diff --git a/kjsembed/bindings/bindingobject.cpp b/kjsembed/bindings/bindingobject.cpp
index 2c280e5c..c8b2bd1a 100644
--- a/kjsembed/bindings/bindingobject.cpp
+++ b/kjsembed/bindings/bindingobject.cpp
@@ -5,8 +5,8 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-BindingObject::BindingObject( TQObject *parent, const char *name )
-    : TQObject( parent, name )
+BindingObject::BindingObject( TTQObject *parent, const char *name )
+    : TTQObject( parent, name )
 {
 }
 
diff --git a/kjsembed/bindings/bindingobject.h b/kjsembed/bindings/bindingobject.h
index 4cd0224c..6a40f55c 100644
--- a/kjsembed/bindings/bindingobject.h
+++ b/kjsembed/bindings/bindingobject.h
@@ -28,19 +28,19 @@ namespace KJSEmbed {
 namespace Bindings {
 
 /**
- * A baseclass for TQObject bindings. This class is currently just a
- * stub, but I hope it will contain utilities for TQObject wrapper
+ * A baseclass for TTQObject bindings. This class is currently just a
+ * stub, but I hope it will contain utilities for TTQObject wrapper
  * classes.
  *
  * @author Richard Moore, rich@kde.org
  * @version $Id$
  */
-class BindingObject : public QObject
+class BindingObject : public TQObject
 {
     Q_OBJECT
 
 public:
-    BindingObject( TQObject *parent, const char *name=0 );
+    BindingObject( TTQObject *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:
-    TQCString jsClazz;
+    TTQCString jsClazz;
     class BindingObjectPrivate *d;
 };
 
diff --git a/kjsembed/bindings/brush_imp.cpp b/kjsembed/bindings/brush_imp.cpp
index c01a03a2..571d64ea 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, "TQBrush") ) return;
+    if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TTQBrush") ) 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, "TQBrush") ) return KJS::Value();
+    if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TTQBrush") ) return KJS::Value();
     JSValueProxy *op = JSProxy::toValueProxy( self.imp() );
-    TQBrush brush = op->toVariant().toBrush();
+    TTQBrush brush = op->toVariant().toBrush();
 
     KJS::Value retValue = KJS::Value();
     switch ( mid ) {
@@ -94,7 +94,7 @@ KJS::Value BrushImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L
     case MethodsetStyle:
     {
     	int style = extractInt(exec, args, 0);
-	brush.setStyle((Qt::BrushStyle)style);
+	brush.setStyle((TQt::BrushStyle)style);
 	break;
     }
     case MethodColor:
@@ -104,7 +104,7 @@ KJS::Value BrushImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L
     }
     case MethodsetColor:
     {
-    	TQColor color = extractQColor(exec, args, 0);
+    	TTQColor color = extractTQColor(exec, args, 0);
 	brush.setColor(color);
 	break;
     }
diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp
index d27ff703..62ffb456 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
 {
-    TQString application = extractQString(exec, args, 0);
-    TQString object = extractQString(exec, args, 1);
+    TTQString application = extractTQString(exec, args, 0);
+    TTQString 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);
 	    }
-            TQByteArray data, replyData;
-	    TQDataStream ds( replyData, IO_ReadOnly);
-            TQCString type;
+            TTQByteArray data, replyData;
+	    TTQDataStream ds( replyData, IO_ReadOnly);
+            TTQCString type;
 
-            TQString app = ref->app();
-            TQString interface = ref->obj();
-            TQString function = extractQString(exec, args, 0);
-            TQStringList argTypes = JSDCOPClient::getTypes( function );
+            TTQString app = ref->app();
+            TTQString interface = ref->obj();
+            TTQString function = extractTQString(exec, args, 0);
+            TTQStringList 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);
 
-             TQByteArray data;
-             TQString app = ref->app();
-             TQString interface = ref->obj();
-             TQString function = extractQString(exec, args, 0);
+             TTQByteArray data;
+             TTQString app = ref->app();
+             TTQString interface = ref->obj();
+             TTQString function = extractTQString(exec, args, 0);
 
-             TQStringList argTypes = JSDCOPClient::getTypes( function );
+             TTQStringList 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:
 	{
-      TQString arg0 = extractQString(exec, args, 0);
-      TQString arg1 = extractQString(exec, args, 1);
-      TQString arg2 = extractQString(exec, args, 0);
+      TTQString arg0 = extractTQString(exec, args, 0);
+      TTQString arg1 = extractTQString(exec, args, 1);
+      TTQString 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: {
-	    TQString arg0 = extractQString(exec, args, 0);
+	    TTQString arg0 = extractTQString(exec, args, 0);
 	    retValue = convertToValue( exec, remoteObjects(arg0));
 	    break;
 	}
 	case MethodremoteInterfaces: {
-	    TQString arg0 = extractQString(exec, args, 0);
-	    TQString arg1 = extractQString(exec, args, 1);
+	    TTQString arg0 = extractTQString(exec, args, 0);
+	    TTQString arg1 = extractTQString(exec, args, 1);
 	    this->remoteInterfaces(arg0, arg1);
 	    break;
 	}
 	case MethodremoteFunctions: {
-	    TQString arg0 = extractQString(exec, args, 0);
-	    TQString arg1 = extractQString(exec, args, 1);
+	    TTQString arg0 = extractTQString(exec, args, 0);
+	    TTQString arg1 = extractTQString(exec, args, 1);
 	    remoteFunctions(arg0, arg1);
 	    break;
 	}
 	case MethodconnectDCOPSignal: {
-	    TQString arg0 = extractQString(exec, args, 0);
-	    TQString arg1 = extractQString(exec, args, 1);
-	    TQString arg2 = extractQString(exec, args, 2);
-	    TQString arg3 = extractQString(exec, args, 3);
-	    TQString arg4 = extractQString(exec, args, 4);
+	    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);
 	    bool arg5 = (args.size() > 5) ? args[5].toBoolean(exec) : false;
 	    connectDCOPSignal( arg0, arg1, arg2, arg3, arg4, arg5);
 	    break;
 	}
 	case MethoddisconnectDCOPSignal: {
-	    TQString arg0 = extractQString(exec, args, 0);
-	    TQString arg1 = extractQString(exec, args, 1);
-	    TQString arg2 = extractQString(exec, args, 2);
-	    TQString arg3 = extractQString(exec, args, 3);
-	    TQString arg4 = extractQString(exec, args, 4);
+	    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);
 	    disconnectDCOPSignal(arg0, arg1, arg2, arg3, arg4);
 	    break;
 	}
 	case MethodDCOPStart: {
-		TQString arg0 = extractQString(exec, args, 0);
+		TTQString arg0 = extractTQString(exec, args, 0);
 
-		retValue = KJS::String( dcopStart( arg0, TQStringList() ) );
+		retValue = KJS::String( dcopStart( arg0, TTQStringList() ) );
 		break;
 	}
 	case MethodappId:
 		retValue = KJS::String( kapp->dcopClient()->appId().data() );
 		break;
 	case MethodisApplicationRegistered: {
-		TQString arg0 = extractQString(exec, args, 0);
+		TTQString 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);
 
-	TQStringList types;
-	TQByteArray data, replyData;
-	TQDataStream ds( replyData, IO_ReadOnly);
-	TQCString type;
+	TTQStringList types;
+	TTQByteArray data, replyData;
+	TTQDataStream ds( replyData, IO_ReadOnly);
+	TTQCString type;
 
-	TQString app = extractQString(exec, args, 0);
-	TQString interface = extractQString(exec, args, 1);
-	TQString function = extractQString(exec, args, 2);
-	TQStringList argTypes = getTypes( function );
+	TTQString app = extractTQString(exec, args, 0);
+	TTQString interface = extractTQString(exec, args, 1);
+	TTQString function = extractTQString(exec, args, 2);
+	TTQStringList argTypes = getTypes( function );
 
 	if( args.size() > 3)
 		for( int idx = 3; idx < args.size(); ++idx)
 		{
-			TQVariant var = convertToVariant(exec,args[idx] );
+			TTQVariant 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);
 
-	TQByteArray data;
-	TQString app = extractQString(exec, args, 0);
-	TQString interface = extractQString(exec, args, 1);
-	TQString function = extractQString(exec, args, 2);
-	TQStringList argTypes = getTypes( function );
+	TTQByteArray data;
+	TTQString app = extractTQString(exec, args, 0);
+	TTQString interface = extractTQString(exec, args, 1);
+	TTQString function = extractTQString(exec, args, 2);
+	TTQStringList argTypes = getTypes( function );
 
 	if( args.size() > 3)
 		for( int idx = 3; idx < args.size(); ++idx)
 		{
-			TQVariant var = convertToVariant(exec,args[idx] );
+			TTQVariant 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 TQCString& type, TQDataStream& data)
+KJS::Value JSDCOPClient::demarshall( KJS::ExecState * exec, const TTQCString& type, TTQDataStream& data)
 {
 	kdDebug() << "Demarshall " << type << endl;
 
@@ -449,23 +449,23 @@ KJS::Value JSDCOPClient::demarshall( KJS::ExecState * exec, const TQCString& typ
 		return convertToValue(exec, demarshall(type, data));
 }
 
-TQStringList JSDCOPClient::getTypes( const TQString& function )
+TTQStringList JSDCOPClient::getTypes( const TTQString& function )
 {
-	TQCString myFunction = DCOPClient::normalizeFunctionSignature (function.latin1());
-	TQString args = myFunction.mid( myFunction.find('(') + 1 );
+	TTQCString myFunction = DCOPClient::normalizeFunctionSignature (function.latin1());
+	TTQString args = myFunction.mid( myFunction.find('(') + 1 );
 	args = args.left( args.length() - 1);
-	return TQStringList::split(',', args);
+	return TTQStringList::split(',', args);
 }
 
-void JSDCOPClient::marshall( const TQVariant& data, const TQString& typeName, TQByteArray& buffer )
+void JSDCOPClient::marshall( const TTQVariant& data, const TTQString& typeName, TTQByteArray& buffer )
 {
-	TQDataStream stream(buffer, IO_WriteOnly | IO_Append);
+	TTQDataStream stream(buffer, IO_WriteOnly | IO_Append);
 
-	if ( typeName == "TQString" )
+	if ( typeName == "TTQString" )
 	{
 		stream << data.toString();
 	}
-	else if ( typeName == "TQCString")
+	else if ( typeName == "TTQCString")
 	{
 		stream << data.toCString();
 	}
@@ -485,99 +485,99 @@ void JSDCOPClient::marshall( const TQVariant& data, const TQString& typeName, TQ
 	{
 		stream << data.toDouble();
 	}
-	else if ( typeName == "TQMap" )
+	else if ( typeName == "TTQMap" )
 	{
 		stream << data.toMap();
 	}
-	else if ( typeName == "TQValueList")
+	else if ( typeName == "TTQValueList")
 	{
 		stream << data.toList();
 	}
-	else if ( typeName == "TQFont")
+	else if ( typeName == "TTQFont")
 	{
 		stream << data.toFont();
 	}
-	else if ( typeName == "TQPixmap")
+	else if ( typeName == "TTQPixmap")
 	{
 		stream << data.toPixmap();
 	}
-	else if ( typeName == "TQBrush")
+	else if ( typeName == "TTQBrush")
 	{
 		stream << data.toBrush();
 	}
-	else if ( typeName == "TQRect")
+	else if ( typeName == "TTQRect")
 	{
 		stream << data.toRect();
 	}
-	else if ( typeName == "TQSize")
+	else if ( typeName == "TTQSize")
 	{
 		stream << data.toSize();
 	}
-	else if ( typeName == "TQColor")
+	else if ( typeName == "TTQColor")
 	{
 		stream << data.toColor();
 	}
-	else if ( typeName == "TQPalette")
+	else if ( typeName == "TTQPalette")
 	{
 		stream << data.toPalette();
 	}
-	else if ( typeName == "TQColorGroup")
+	else if ( typeName == "TTQColorGroup")
 	{
 		stream << data.toColorGroup();
 	}
-	/*else if ( typeName == "TQIconSet")
+	/*else if ( typeName == "TTQIconSet")
 	{
 		stream << data.toIconSet();
 	}*/
-	else if ( typeName == "TQPoint")
+	else if ( typeName == "TTQPoint")
 	{
 		stream << data.toPoint();
 	}
-	else if ( typeName == "TQImage")
+	else if ( typeName == "TTQImage")
 	{
 		stream << data.toImage();
 	}
-	else if ( typeName == "TQPointArray")
+	else if ( typeName == "TTQPointArray")
 	{
 		stream << data.toPointArray();
 	}
-	else if ( typeName == "TQRegion")
+	else if ( typeName == "TTQRegion")
 	{
 		stream << data.toRegion();
 	}
-	else if ( typeName == "TQBitmap")
+	else if ( typeName == "TTQBitmap")
 	{
 		stream << data.toBitmap();
 	}
-	else if ( typeName == "TQCursor")
+	else if ( typeName == "TTQCursor")
 	{
 		stream << data.toCursor();
 	}
-	/*else if ( typeName == "TQSizePolicy")
+	/*else if ( typeName == "TTQSizePolicy")
 	{
 		stream << data.toSizePolicy();
 	}*/
-	else if ( typeName == "TQDate")
+	else if ( typeName == "TTQDate")
 	{
 		stream << data.toDate();
 	}
-	else if ( typeName == "TQTime")
+	else if ( typeName == "TTQTime")
 	{
 		stream << data.toTime();
 	}
-	else if ( typeName == "TQDateTime")
+	else if ( typeName == "TTQDateTime")
 	{
 		stream << data.toDateTime();
 	}
-	else if ( typeName == "TQByteArray")
+	else if ( typeName == "TTQByteArray")
 	{
 		stream << data.toByteArray();
 	}
-	else if ( typeName == "TQBitArray")
+	else if ( typeName == "TTQBitArray")
 	{
 		stream << data.toBitArray();
 	}
-	else if ( typeName == "TQKeySequence")
+	else if ( typeName == "TTQKeySequence")
 	{
 		stream << data.toKeySequence();
 	}
@@ -591,18 +591,18 @@ void JSDCOPClient::marshall( const TQVariant& data, const TQString& typeName, TQ
 
 }
 
-TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& args )
+TTQString JSDCOPClient::dcopStart( const TTQString &appName, const TTQStringList& args )
 {
-	TQString error;
-	TQString startFunction;
+	TTQString error;
+	TTQString startFunction;
 	if (appName.endsWith(".desktop"))
-		startFunction = "start_service_by_desktop_path(TQString,TQStringList)";
+		startFunction = "start_service_by_desktop_path(TTQString,TTQStringList)";
 	else
-		startFunction = "start_service_by_desktop_name(TQString,TQStringList)";
+		startFunction = "start_service_by_desktop_name(TTQString,TTQStringList)";
 
-	TQByteArray data, replyData;
-	TQCString replyType;
-	TQDataStream arg(data, IO_WriteOnly);
+	TTQByteArray data, replyData;
+	TTQCString replyType;
+	TTQDataStream arg(data, IO_WriteOnly);
 	arg << appName << args;
 
 	if ( !kapp->dcopClient()->call( "klauncher", "klauncher", startFunction.latin1(),  data, replyType, replyData) )
@@ -611,7 +611,7 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a
 	}
 	else
 	{
-		TQDataStream reply(replyData, IO_ReadOnly);
+		TTQDataStream reply(replyData, IO_ReadOnly);
 
 		if ( replyType != "serviceResult" )
 		{
@@ -620,8 +620,8 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a
 		else
 		{
 			int result;
-			TQCString dcopName;
-			TQString error;
+			TTQCString dcopName;
+			TTQString error;
 			reply >> result >> dcopName >> error;
 			if (result != 0)
 			{
@@ -640,57 +640,57 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a
 
 }
 
-TQStringList JSDCOPClient::remoteFunctions( const TQString & remApp, const TQString & remObj )
+TTQStringList JSDCOPClient::remoteFunctions( const TTQString & remApp, const TTQString & remObj )
 {
-	TQStringList returnList;
-	QCStringList lst = kapp->dcopClient()->remoteFunctions(remApp.local8Bit(), remObj.local8Bit());
+	TTQStringList returnList;
+	TQCStringList lst = kapp->dcopClient()->remoteFunctions(remApp.local8Bit(), remObj.local8Bit());
 	for(uint idx = 0; idx < lst.count(); ++idx)
 		returnList += lst[idx];
 	return returnList;
 }
 
-TQStringList JSDCOPClient::remoteInterfaces( const TQString & remApp, const TQString & remObj )
+TTQStringList JSDCOPClient::remoteInterfaces( const TTQString & remApp, const TTQString & remObj )
 {
-	TQStringList returnList;
-	QCStringList lst = kapp->dcopClient()->remoteInterfaces(remApp.local8Bit(), remObj.local8Bit());
+	TTQStringList returnList;
+	TQCStringList lst = kapp->dcopClient()->remoteInterfaces(remApp.local8Bit(), remObj.local8Bit());
 	for(uint idx = 0; idx < lst.count(); ++idx)
 		returnList += lst[idx];
 	return returnList;
 }
 
-TQStringList JSDCOPClient::remoteObjects( const TQString & remApp )
+TTQStringList JSDCOPClient::remoteObjects( const TTQString & remApp )
 {
-	TQStringList returnList;
-	QCStringList lst = kapp->dcopClient()->remoteObjects(remApp.local8Bit());
+	TTQStringList returnList;
+	TQCStringList lst = kapp->dcopClient()->remoteObjects(remApp.local8Bit());
 	for(uint idx = 0; idx < lst.count(); ++idx)
 		returnList += lst[idx];
 	return returnList;
 }
 
-TQStringList JSDCOPClient::registeredApplications( )
+TTQStringList JSDCOPClient::registeredApplications( )
 {
-	TQStringList returnList;
-	QCStringList lst = kapp->dcopClient()->registeredApplications( );
+	TTQStringList returnList;
+	TQCStringList lst = kapp->dcopClient()->registeredApplications( );
 	for(uint idx = 0; idx < lst.count(); ++idx)
 		returnList += lst[idx];
 	return returnList;
 }
 
-bool JSDCOPClient::connectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot, bool Volatile)
+bool JSDCOPClient::connectDCOPSignal (const TTQString &sender, const TTQString &senderObj, const TTQString &signal, const TTQString &receiverObj, const TTQString &slot, bool Volatile)
 {
 	return kapp->dcopClient()->connectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1(), Volatile);
 }
 
-bool JSDCOPClient::disconnectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot)
+bool JSDCOPClient::disconnectDCOPSignal (const TTQString &sender, const TTQString &senderObj, const TTQString &signal, const TTQString &receiverObj, const TTQString &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
 {
-    TQObject *parent = extractQObject(exec, args, 0);
-    TQString name = extractQString(exec, args, 1);
-    TQObject *obj = new JSDCOPInterface(jspart->interpreter(),parent, name.latin1() );
+    TTQObject *parent = extractTQObject(exec, args, 0);
+    TTQString name = extractTQString(exec, args, 1);
+    TTQObject *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 TQString & signature )
+void JSDCOPInterface::publish( const TTQString & 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, TQObject * parent, const char * name )
+JSDCOPInterface::JSDCOPInterface( KJS::Interpreter *js, TTQObject * parent, const char * name )
 	: BindingObject( parent, name ),DCOPObject(name), m_js(js)
 {
 	m_Members.clear();
 }
 
-QCStringList JSDCOPInterface::functionsDynamic( )
+TTQCStringList JSDCOPInterface::functionsDynamic( )
 {
 	return m_Members;
 }
 
-bool JSDCOPInterface::processDynamic( const TQCString & rawFunction, const TQByteArray & data, TQCString & replyType, TQByteArray & replyData )
+bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQByteArray & data, TTQCString & replyType, TTQByteArray & replyData )
 {
 	bool isOkay = false;
 
-	TQRegExp reg = TQRegExp("([_\\d\\w]+)(\\()(.*)(\\))");
+	TTQRegExp reg = TTQRegExp("([_\\d\\w]+)(\\()(.*)(\\))");
 	reg.search(rawFunction);
 
 	kdDebug() << "Raw function: " << rawFunction << endl;
@@ -737,9 +737,9 @@ bool JSDCOPInterface::processDynamic( const TQCString & rawFunction, const TQByt
 	kdDebug() << "Signature: " << reg.cap(1) << endl;
 	kdDebug() << "Args: " << reg.cap(3) << endl;
 
-	TQString signature = reg.cap(1);
+	TTQString signature = reg.cap(1);
 
-	TQStringList argStrings = TQStringList::split(',', reg.cap(3), false);
+	TTQStringList argStrings = TTQStringList::split(',', reg.cap(3), false);
 	kdDebug() << argStrings.count() << " args..." << endl;
 
 	KJS::ExecState *exec = m_js->globalExec();
@@ -751,7 +751,7 @@ bool JSDCOPInterface::processDynamic( const TQCString & rawFunction, const TQByt
 
 	if ( fun.implementsCall() )
 	{
-		TQDataStream ds( data, IO_ReadOnly );
+		TTQDataStream ds( data, IO_ReadOnly );
 		KJS::List args;
 		for( uint idx = 0; idx < argStrings.count(); ++idx)
 		{
@@ -779,7 +779,7 @@ bool JSDCOPInterface::processDynamic( const TQCString & rawFunction, const TQByt
           if( oprx )
           {
             replyType = "DCOPRef";
-            TQDataStream refStream( replyData, IO_WriteOnly );
+            TTQDataStream refStream( replyData, IO_WriteOnly );
             if( oprx->typeName() == "DCOPRef" )
             {
                 DCOPRef ref(*oprx->toNative<DCOPRef>());
@@ -790,7 +790,7 @@ bool JSDCOPInterface::processDynamic( const TQCString & rawFunction, const TQByt
 			}
 			else
 			{
-				TQVariant returnVariant = convertToVariant(exec, retValue);
+				TTQVariant returnVariant = convertToVariant(exec, retValue);
 				JSDCOPClient::marshall(returnVariant,returnVariant.typeName(), replyData);
 				replyType = returnVariant.typeName();
 				isOkay = true;
@@ -800,216 +800,216 @@ bool JSDCOPInterface::processDynamic( const TQCString & rawFunction, const TQByt
 	return isOkay;
 }
 
-TQVariant JSDCOPClient::demarshall( const TQCString & type, TQDataStream & reply )
+TTQVariant JSDCOPClient::demarshall( const TTQCString & type, TTQDataStream & reply )
 {
 	kdDebug() << "Type: '" << type << "'"<< endl;
-	/*if ( type == "TQMap" )  // ? dont handle?
+	/*if ( type == "TTQMap" )  // ? dont handle?
 	{
-		TQMap<TQVariant, TQVariant> result;
+		TTQMap<TTQVariant, TTQVariant> result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQValueList") // ? dont handle?
+	else if ( type == "TTQValueList") // ? dont handle?
 	{
-		TQValueList<TQVariant> result;
+		TTQValueList<TTQVariant> result;
 		reply >> result;
-		return TQVariant(result);
-	}else if ( type == "QVariantList")
+		return TTQVariant(result);
+	}else if ( type == "TQVariantList")
 	{
-		QVariantList result;
+		TQVariantList result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
 	else */
-	if ( type == "TQString")
+	if ( type == "TTQString")
 	{
-		TQString result;
+		TTQString result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
 	else if ( type == "int")
 	{
 		int result;
 		reply >> result;
 		kdDebug() << "Result: " << result << endl;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
 	else if ( type == "uint")
 	{
 		uint result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
 	else if ( type == "bool")
 	{
 		bool result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
 	else if ( type == "double")
 	{
 		double result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQCString")
+	else if ( type == "TTQCString")
 	{
-		TQCString result;
+		TTQCString result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQVariant")
+	else if ( type == "TTQVariant")
 	{
-		TQVariant result;
+		TTQVariant result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQFont")
+	else if ( type == "TTQFont")
 	{
-		TQFont result;
+		TTQFont result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQPixmap")
+	else if ( type == "TTQPixmap")
 	{
-		TQPixmap result;
+		TTQPixmap result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQBrush")
+	else if ( type == "TTQBrush")
 	{
-		TQBrush result;
+		TTQBrush result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQRect")
+	else if ( type == "TTQRect")
 	{
-		TQRect result;
+		TTQRect result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQSize")
+	else if ( type == "TTQSize")
 	{
-		TQSize result;
+		TTQSize result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQColor")
+	else if ( type == "TTQColor")
 	{
-		TQColor result;
+		TTQColor result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQPalette")
+	else if ( type == "TTQPalette")
 	{
-		TQPalette result;
+		TTQPalette result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQColorGroup")
+	else if ( type == "TTQColorGroup")
 	{
-		TQColorGroup result;
+		TTQColorGroup result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	/*else if ( type == "TQIconSet")
+	/*else if ( type == "TTQIconSet")
 	{
-		TQIconSet result;
+		TTQIconSet result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}*/
-	else if ( type == "TQPoint")
+	else if ( type == "TTQPoint")
 	{
-		TQPoint result;
+		TTQPoint result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQImage")
+	else if ( type == "TTQImage")
 	{
-		TQImage result;
+		TTQImage result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQPointArray")
+	else if ( type == "TTQPointArray")
 	{
-		TQPointArray result;
+		TTQPointArray result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQRegion")
+	else if ( type == "TTQRegion")
 	{
-		TQRegion result;
+		TTQRegion result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQBitmap")
+	else if ( type == "TTQBitmap")
 	{
-		TQBitmap result;
+		TTQBitmap result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQCursor")
+	else if ( type == "TTQCursor")
 	{
-		TQCursor result;
+		TTQCursor result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	/*else if ( type == "TQSizePolicy")
+	/*else if ( type == "TTQSizePolicy")
 	{
-		TQSizePolicy result;
+		TTQSizePolicy result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}*/
-	else if ( type == "TQDate")
+	else if ( type == "TTQDate")
 	{
-		TQDate result;
+		TTQDate result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQTime")
+	else if ( type == "TTQTime")
 	{
-		TQTime result;
+		TTQTime result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQDateTime")
+	else if ( type == "TTQDateTime")
 	{
-		TQDateTime result;
+		TTQDateTime result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQByteArray")
+	else if ( type == "TTQByteArray")
 	{
-		TQByteArray result;
+		TTQByteArray result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQBitArray")
+	else if ( type == "TTQBitArray")
 	{
-		TQBitArray result;
+		TTQBitArray result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQKeySequence")
+	else if ( type == "TTQKeySequence")
 	{
-		TQKeySequence result;
+		TTQKeySequence result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "TQStringList")
+	else if ( type == "TTQStringList")
 	{
-		TQStringList result;
+		TTQStringList result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
-	else if ( type == "QCStringList")
+	else if ( type == "TQCStringList")
 	{
-		TQStringList result;
+		TTQStringList result;
 		reply >> result;
-		return TQVariant(result);
+		return TTQVariant(result);
 	}
 	else
-		return TQVariant();
+		return TTQVariant();
 
 }
 } // namespace Bindings
diff --git a/kjsembed/bindings/dcop_imp.h b/kjsembed/bindings/dcop_imp.h
index 6a821028..ca20fdca 100644
--- a/kjsembed/bindings/dcop_imp.h
+++ b/kjsembed/bindings/dcop_imp.h
@@ -48,22 +48,22 @@ class JSDCOPInterfacerLoader : public JSBindingBase
 };
 
 /**
-* TQObject Binding for a DCOP interface
+* TTQObject Binding for a DCOP interface
 */
 class JSDCOPInterface : public BindingObject, public DCOPObject
 {
     Q_OBJECT
 
 public:
-    JSDCOPInterface( KJS::Interpreter *js, TQObject *parent, const char *name=0 );
+    JSDCOPInterface( KJS::Interpreter *js, TTQObject *parent, const char *name=0 );
     virtual ~JSDCOPInterface();
-    QCStringList functionsDynamic();
-    bool processDynamic (const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData);
+    TQCStringList functionsDynamic();
+    bool processDynamic (const TTQCString &fun, const TTQByteArray &data, TTQCString &replyType, TTQByteArray &replyData);
 public slots:
-    void publish(const TQString& signature);
+    void publish(const TTQString& signature);
 
 private:
-   QCStringList m_Members;
+   TQCStringList m_Members;
    KJS::Interpreter *m_js;
 };
 
@@ -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 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);
+    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);
 
     bool attach() const;
     bool detach() const;
 
     bool isAttached() const;
 
-    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);
+    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);
     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 96879546..230fbe63 100644
--- a/kjsembed/bindings/iconset_imp.cpp
+++ b/kjsembed/bindings/iconset_imp.cpp
@@ -48,7 +48,7 @@ void IconsetImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) {
         return;
     }
 
-    if ( op->typeName() != "QIconset" ) {
+    if ( op->typeName() != "TQIconset" ) {
 	kdWarning() << "IconsetImp::addBindings() failed, type is " << op->typeName() << endl;
 	return;
     }
@@ -109,29 +109,29 @@ KJS::Value IconsetImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS:
         return KJS::Value();
     }
 
-    if ( op->typeName() != "TQIconSet" ) {
+    if ( op->typeName() != "TTQIconSet" ) {
 	kdWarning() << "IconsetImp::call() failed, type is " << op->typeName() << endl;
 	return KJS::Value();
     }
 
-    TQIconSet iconset = op->toVariant().toIconSet();
+    TTQIconSet iconset = op->toVariant().toIconSet();
 
     KJS::Value retValue = KJS::Value();
     switch ( mid ) {
     case MethodReset:
     {
-    	TQPixmap pix = extractQPixmap(exec, args, 0);
-	TQIconSet::Size size = (TQIconSet::Size) extractInt(exec, args, 1 );
+    	TTQPixmap pix = extractTQPixmap(exec, args, 0);
+	TTQIconSet::Size size = (TTQIconSet::Size) extractInt(exec, args, 1 );
 	iconset.reset(pix,size);
 	break;
     }
     case MethodSetPixmap:
     {
-	TQPixmap pix = extractQPixmap( exec, args, 0);
-	TQString fname = extractQString( 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);
+	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);
 	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:
     {
-	TQPixmap pix;
+	TTQPixmap pix;
 
 	if( args.size() == 3 )
 	{
-		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 );
+		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 );
 		pix = iconset.pixmap( size, mode, state );
 	}
 	else
diff --git a/kjsembed/bindings/image_imp.cpp b/kjsembed/bindings/image_imp.cpp
index 65dd10eb..8c79e946 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, "TQImage") ) return;
+    if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TTQImage") ) 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, "TQImage") ) return KJS::Value();
+    if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TTQImage") ) 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: {
-            TQString arg0 = extractQString( exec, args, 0);
+            TTQString arg0 = extractTQString( exec, args, 0);
             retValue = KJS::Boolean( load( arg0 ));
             break;
         }
     case Methodsave: {
-            TQString arg0 = extractQString( exec, args, 0);
-            TQString arg1 = extractQString( exec, args, 1);
+            TTQString arg0 = extractTQString( exec, args, 0);
+            TTQString arg1 = extractTQString( exec, args, 1);
             retValue = KJS::Boolean( save( arg0, arg1 ));
             break;
         }
     case MethodsetFormat: {
-            TQString arg0 = extractQString( exec, args, 0);
+            TTQString 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: {
-            TQPixmap pix = extractQPixmap(exec, args, 0);
+            TTQPixmap pix = extractTQPixmap(exec, args, 0);
             setPixmap(pix);
             break;
         }
@@ -184,50 +184,50 @@ bool ImageImp::isOk() const {
     return !img.isNull();
 }
 
-TQPixmap ImageImp::pixmap() const {
+TTQPixmap ImageImp::pixmap() const {
     if ( img.isNull() )
-        return TQPixmap();
+        return TTQPixmap();
 
-    TQPixmap pix;
+    TTQPixmap pix;
     pix.convertFromImage( img );
     return pix;
 }
 
-void ImageImp::setPixmap( const TQPixmap &pix ) {
+void ImageImp::setPixmap( const TTQPixmap &pix ) {
     if ( img.isNull() )
-        img = TQImage();
+        img = TTQImage();
 
     img = pix.convertToImage();
 }
 
-TQString ImageImp::format() const {
+TTQString ImageImp::format() const {
     return fmt;
 }
 
-TQString ImageImp::filename() const {
+TTQString ImageImp::filename() const {
     return nm;
 }
 
-void ImageImp::setFormat( const TQString &f ) {
+void ImageImp::setFormat( const TTQString &f ) {
     fmt = f;
 }
 
-bool ImageImp::load( const TQString &filename ) {
+bool ImageImp::load( const TTQString &filename ) {
 
     if ( !img.isNull() )
-        img = TQImage();
+        img = TTQImage();
 
     nm = filename;
-    fmt = TQImageIO::imageFormat( filename );
+    fmt = TTQImageIO::imageFormat( filename );
     bool ok = img.load( filename );
     if ( !ok ) {
     	kdWarning() << "Error loading " << filename << endl;
-        img = TQImage();
+        img = TTQImage();
     }
     return ok;
 }
 
-bool ImageImp::save( const TQString &filename, const TQString &fmt ) {
+bool ImageImp::save( const TTQString &filename, const TTQString &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, TQImage::ScaleMin );
+    img = img.smoothScale( w, h, TTQImage::ScaleMin );
 }
 
 
diff --git a/kjsembed/bindings/image_imp.h b/kjsembed/bindings/image_imp.h
index 39cb7031..94d84e01 100644
--- a/kjsembed/bindings/image_imp.h
+++ b/kjsembed/bindings/image_imp.h
@@ -32,7 +32,7 @@ namespace KJSEmbed {
 namespace Bindings {
 
 /**
- * Methods for the TQImage binding.
+ * Methods for the TTQImage binding.
  *
  * @author Richard Moore, rich@kde.org
  * @version $Id$
@@ -66,27 +66,27 @@ public:
 
 private:
 
-    TQString filename() const;
-    TQString format() const;
+    TTQString filename() const;
+    TTQString format() const;
     int width() const;
     int height() const;
     int depth() const;
 
     bool isOk() const;
-    TQPixmap pixmap() const;
+    TTQPixmap pixmap() const;
 
-    bool load( const TQString &filename );
-    bool save( const TQString &filename, const TQString &fmt );
-    void setFormat( const TQString &fmt );
+    bool load( const TTQString &filename );
+    bool save( const TTQString &filename, const TTQString &fmt );
+    void setFormat( const TTQString &fmt );
     void smoothScale( int w, int h );
     void smoothScaleMin( int w, int h );
-    void setPixmap( const TQPixmap &pix );
+    void setPixmap( const TTQPixmap &pix );
 
 
     int mid;
-    TQImage img; // this is a temp!!!
-    TQString nm;
-    TQString fmt;
+    TTQImage img; // this is a temp!!!
+    TTQString nm;
+    TTQString fmt;
 };
 
 } // namespace
diff --git a/kjsembed/bindings/kconfig_imp.cpp b/kjsembed/bindings/kconfig_imp.cpp
index d4f2a290..c669663f 100644
--- a/kjsembed/bindings/kconfig_imp.cpp
+++ b/kjsembed/bindings/kconfig_imp.cpp
@@ -32,7 +32,7 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-Config::Config( TQObject *parent, const char *name)
+Config::Config( TTQObject *parent, const char *name)
     : BindingObject(parent, name)
 {
 
@@ -46,21 +46,21 @@ Config::Config( TQObject *parent, const char *name)
 	  kdWarning( 80001 ) << "Could not write to config file." << endl;
 	}
 #else
-	m_config = new TQSettings();
+	m_config = new TTQSettings();
 	if( name == 0)
 	  m_name = "qjcmd";
 	else
 	  m_name = name;
-	m_config->setPath( "QJSEmbed",m_name, TQSettings::User );
+	m_config->setPath( "TQJSEmbed",m_name, TTQSettings::User );
 	m_forceGlobal = false;
 #endif
 }
 
 /*
-Config::Config( TQObject *parent, const char *name , const TQString& confName)
+Config::Config( TTQObject *parent, const char *name , const TTQString& confName)
         : BindingObject(parent, name)
 {
-    TQString fileName = ::locate("kde_config", confName);
+    TTQString fileName = ::locate("kde_config", confName);
     m_config = new KConfig(fileName);
 }
 */
@@ -82,7 +82,7 @@ void Config::setDesktopGroup()
 #endif 
 }
 
-void Config::setGroup(const TQString& group)
+void Config::setGroup(const TTQString& group)
 {
 #ifndef QT_ONLY
     m_config->setGroup(group);
@@ -92,12 +92,12 @@ void Config::setGroup(const TQString& group)
 #endif 
 }
 
-TQString Config::group()
+TTQString Config::group()
 {
     return m_config->group();
 }
 
-TQStringList Config::groupList()
+TTQStringList Config::groupList()
 {
 #ifndef QT_ONLY
     return m_config->groupList();
@@ -107,7 +107,7 @@ TQStringList Config::groupList()
 #endif 
 }
 
-TQString Config::locale()
+TTQString 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( "QJSEmbed",m_name, (force)?TQSettings::Global:TQSettings::User );
+    m_config->setPath( "TQJSEmbed",m_name, (force)?TTQSettings::Global:TTQSettings::User );
 #endif
 }
 
@@ -203,7 +203,7 @@ void Config::sync()
     m_config->sync();
 }
 
-bool Config::hasKey( const TQString& key ) const
+bool Config::hasKey( const TTQString& key ) const
 {
 #ifndef QT_ONLY
     return m_config->hasKey(key);
@@ -212,7 +212,7 @@ bool Config::hasKey( const TQString& key ) const
 #endif 
 }
 
-bool Config::entryIsImmutable(const TQString &key) const
+bool Config::entryIsImmutable(const TTQString &key) const
 {
 #ifndef QT_ONLY
     return m_config->entryIsImmutable(key);
@@ -222,7 +222,7 @@ bool Config::entryIsImmutable(const TQString &key) const
 #endif
 }
 
-void Config::revertToDefault(const TQString &key)
+void Config::revertToDefault(const TTQString &key)
 {
 #ifndef QT_ONLY
     m_config->revertToDefault(key);
@@ -231,7 +231,7 @@ void Config::revertToDefault(const TQString &key)
 #endif 
 }
 
-bool Config::hasDefault(const TQString &key) const
+bool Config::hasDefault(const TTQString &key) const
 {
 #ifndef QT_ONLY
     return m_config->hasDefault(key);
@@ -250,28 +250,28 @@ void Config::setFileWriteMode(int mode)
 #endif  
 }
 
-TQString Config::readEntry(const TQString& pKey, const TQString& aDefault ) const
+TTQString Config::readEntry(const TTQString& pKey, const TTQString& aDefault ) const
 {
     return m_config->readEntry(pKey,aDefault);
 }
 
-TQVariant Config::readPropertyEntry( const TQString& pKey, const TQVariant &pDefault) const
+TTQVariant Config::readPropertyEntry( const TTQString& pKey, const TTQVariant &pDefault) const
 {
 #ifndef QT_ONLY
   return m_config->readPropertyEntry(pKey,pDefault);
 #else
-  TQVariant returnVariant;
+  TTQVariant returnVariant;
   returnVariant = m_config->readEntry(pKey, pDefault.toString());
   return returnVariant;
 #endif 
 }
 
-TQStringList Config::readListEntry( const TQString& pKey  ) const
+TTQStringList Config::readListEntry( const TTQString& pKey  ) const
 {
     return m_config->readListEntry(pKey);
 }
 
-TQString Config::readPathEntry( const TQString& pKey, const TQString & aDefault ) const
+TTQString Config::readPathEntry( const TTQString& pKey, const TTQString & aDefault ) const
 {
 #ifndef QT_ONLY
     return m_config->readPathEntry(pKey,aDefault);
@@ -280,7 +280,7 @@ TQString Config::readPathEntry( const TQString& pKey, const TQString & aDefault
 #endif 
 }
 
-TQStringList Config::readPathListEntry( const TQString& pKey  ) const
+TTQStringList Config::readPathListEntry( const TTQString& pKey  ) const
 {
 #ifndef QT_ONLY
     return m_config->readPathListEntry(pKey);
@@ -290,12 +290,12 @@ TQStringList Config::readPathListEntry( const TQString& pKey  ) const
  
 }
 
-int Config::readNumEntry( const TQString& pKey, int nDefault) const
+int Config::readNumEntry( const TTQString& pKey, int nDefault) const
 {
     return m_config->readNumEntry(pKey,nDefault);
 }
 
-uint Config::readUnsignedNumEntry( const TQString& pKey, uint nDefault) const
+uint Config::readUnsignedNumEntry( const TTQString& pKey, uint nDefault) const
 {
 #ifndef QT_ONLY
     return m_config->readUnsignedNumEntry(pKey,nDefault);
@@ -304,7 +304,7 @@ uint Config::readUnsignedNumEntry( const TQString& pKey, uint nDefault) const
 #endif 
 }
 
-long Config::readLongNumEntry( const TQString& pKey, long nDefault) const
+long Config::readLongNumEntry( const TTQString& pKey, long nDefault) const
 {
 #ifndef QT_ONLY
     return m_config->readLongNumEntry(pKey,nDefault);
@@ -313,7 +313,7 @@ long Config::readLongNumEntry( const TQString& pKey, long nDefault) const
 #endif 
 }
 
-double Config::readDoubleNumEntry( const TQString& pKey, double nDefault ) const
+double Config::readDoubleNumEntry( const TTQString& pKey, double nDefault ) const
 {
 #ifndef QT_ONLY
     return m_config->readDoubleNumEntry(pKey,nDefault);
@@ -322,66 +322,66 @@ double Config::readDoubleNumEntry( const TQString& pKey, double nDefault ) const
 #endif 
 }
 
-TQFont Config::readFontEntry( const TQString& pKey, const TQFont* pDefault ) const
+TTQFont Config::readFontEntry( const TTQString& pKey, const TTQFont* pDefault ) const
 {
 #ifndef QT_ONLY
     return m_config->readFontEntry(pKey,pDefault);
 #else
-    return readPropertyEntry(pKey,TQVariant(*pDefault)).toFont();
+    return readPropertyEntry(pKey,TTQVariant(*pDefault)).toFont();
 #endif 
 }
 
-bool Config::readBoolEntry( const TQString& pKey, const bool bDefault ) const
+bool Config::readBoolEntry( const TTQString& pKey, const bool bDefault ) const
 {
     return m_config->readBoolEntry(pKey,bDefault);
 }
 
-TQRect Config::readRectEntry( const TQString& pKey, const TQRect* pDefault ) const
+TTQRect Config::readRectEntry( const TTQString& pKey, const TTQRect* pDefault ) const
 {
 #ifndef QT_ONLY
   return m_config->readRectEntry(pKey,pDefault);
 #else
-    return readPropertyEntry(pKey,TQVariant(*pDefault)).toRect();
+    return readPropertyEntry(pKey,TTQVariant(*pDefault)).toRect();
 #endif 
 }
 
-TQPoint Config::readPointEntry( const TQString& pKey, const TQPoint* pDefault ) const
+TTQPoint Config::readPointEntry( const TTQString& pKey, const TTQPoint* pDefault ) const
 {
 #ifndef QT_ONLY
     return m_config->readPointEntry(pKey,pDefault);
 #else
-    return readPropertyEntry(pKey,TQVariant(*pDefault)).toPoint();
+    return readPropertyEntry(pKey,TTQVariant(*pDefault)).toPoint();
 #endif 
 }
 
-TQSize Config::readSizeEntry( const TQString& pKey, const TQSize* pDefault  ) const
+TTQSize Config::readSizeEntry( const TTQString& pKey, const TTQSize* pDefault  ) const
 {
 #ifndef QT_ONLY
     return m_config->readSizeEntry(pKey,pDefault);
 #else
-    return readPropertyEntry(pKey,TQVariant(*pDefault)).toSize();
+    return readPropertyEntry(pKey,TTQVariant(*pDefault)).toSize();
 #endif 
 }
 
-TQColor Config::readColorEntry( const TQString& pKey, const TQColor* pDefault ) const
+TTQColor Config::readColorEntry( const TTQString& pKey, const TTQColor* pDefault ) const
 {
 #ifndef QT_ONLY
     return m_config->readColorEntry(pKey,pDefault);
 #else
-    return readPropertyEntry(pKey,TQVariant(*pDefault)).toColor();
+    return readPropertyEntry(pKey,TTQVariant(*pDefault)).toColor();
 #endif 
 }
 
-TQDateTime Config::readDateTimeEntry( const TQString& pKey, const TQDateTime* pDefault) const
+TTQDateTime Config::readDateTimeEntry( const TTQString& pKey, const TTQDateTime* pDefault) const
 {
 #ifndef QT_ONLY
     return m_config->readDateTimeEntry(pKey,pDefault);
 #else
-    return readPropertyEntry(pKey,TQVariant(*pDefault)).toDateTime();
+    return readPropertyEntry(pKey,TTQVariant(*pDefault)).toDateTime();
 #endif 
 }
 
-TQString Config::readEntryUntranslated( const TQString& pKey, const TQString& aDefault ) const
+TTQString Config::readEntryUntranslated( const TTQString& pKey, const TTQString& aDefault ) const
 {
 #ifndef QT_ONLY
     return m_config->readEntryUntranslated(pKey,aDefault);
@@ -389,12 +389,12 @@ TQString Config::readEntryUntranslated( const TQString& pKey, const TQString& aD
     return m_config->readEntry(pKey,aDefault);
 #endif
 }
-void Config::writeEntry( const TQString& pKey, const TQString& pValue  )
+void Config::writeEntry( const TTQString& pKey, const TTQString& pValue  )
 {
     m_config->writeEntry(pKey,pValue);
 }
 
-void Config::writePropertyEntry( const TQString& pKey, const TQVariant& pValue  )
+void Config::writePropertyEntry( const TTQString& pKey, const TTQVariant& pValue  )
 {
 #ifndef QT_ONLY
     m_config->writeEntry(pKey, pValue   );
@@ -403,7 +403,7 @@ void Config::writePropertyEntry( const TQString& pKey, const TQVariant& pValue
 #endif 
 }
 
-void Config::writeListEntry( const TQString& pKey, const TQStringList &rValue   )
+void Config::writeListEntry( const TTQString& pKey, const TTQStringList &rValue   )
 {
 #ifndef QT_ONLY
     m_config->writeEntry(pKey, rValue   );
@@ -412,7 +412,7 @@ void Config::writeListEntry( const TQString& pKey, const TQStringList &rValue
 #endif 
 }
 
-void Config::writeNumEntry( const TQString& pKey, int nValue  )
+void Config::writeNumEntry( const TTQString& pKey, int nValue  )
 {
 #ifndef QT_ONLY
     m_config->writeEntry(pKey, nValue  );
@@ -420,7 +420,7 @@ void Config::writeNumEntry( const TQString& pKey, int nValue  )
        m_config->writeEntry(pKey,nValue); 
 #endif
 }
-void Config::writeUnsignedNumEntry( const TQString& pKey, uint nValue  )
+void Config::writeUnsignedNumEntry( const TTQString& pKey, uint nValue  )
 {
 #ifndef QT_ONLY
     m_config->writeEntry(pKey, nValue   );
@@ -428,7 +428,7 @@ void Config::writeUnsignedNumEntry( const TQString& pKey, uint nValue  )
     writeNumEntry(pKey, (int)nValue );
 #endif 
 }
-void Config::writeLongNumEntry( const TQString& pKey, unsigned long nValue  )
+void Config::writeLongNumEntry( const TTQString& pKey, unsigned long nValue  )
 {
 #ifndef QT_ONLY
     m_config->writeEntry(pKey, nValue   );
@@ -436,15 +436,15 @@ void Config::writeLongNumEntry( const TQString& pKey, unsigned long nValue  )
     writeNumEntry(pKey, (int)nValue);
 #endif
 }
-void Config::writeDoubleNumEntry( const TQString& pKey, double nValue )
+void Config::writeDoubleNumEntry( const TTQString& pKey, double nValue )
 {
     m_config->writeEntry(pKey,nValue);
 }
-void Config::writeBoolEntry( const TQString& pKey, bool bValue  )
+void Config::writeBoolEntry( const TTQString& pKey, bool bValue  )
 {
     m_config->writeEntry(pKey,bValue);
 }
-void Config::writeFontEntry( const TQString& pKey, const TQFont& rFont  )
+void Config::writeFontEntry( const TTQString& pKey, const TTQFont& rFont  )
 {
 #ifndef QT_ONLY
     m_config->writeEntry(pKey, rFont   );
@@ -453,7 +453,7 @@ void Config::writeFontEntry( const TQString& pKey, const TQFont& rFont  )
 #endif 
  
 }
-void Config::writeColorEntry( const TQString& pKey, const TQColor& rColor  )
+void Config::writeColorEntry( const TTQString& pKey, const TTQColor& rColor  )
 {
 #ifndef QT_ONLY
     m_config->writeEntry(pKey, rColor   );
@@ -462,7 +462,7 @@ void Config::writeColorEntry( const TQString& pKey, const TQColor& rColor  )
 #endif 
  
 }
-void Config::writeDateTimeEntry( const TQString& pKey, const TQDateTime& rDateTime  )
+void Config::writeDateTimeEntry( const TTQString& pKey, const TTQDateTime& rDateTime  )
 {
 #ifndef QT_ONLY
     m_config->writeEntry(pKey, rDateTime   );
@@ -471,7 +471,7 @@ void Config::writeDateTimeEntry( const TQString& pKey, const TQDateTime& rDateTi
 #endif 
  
 }
-void Config::writeRectEntry( const TQString& pKey, const TQRect& rValue  )
+void Config::writeRectEntry( const TTQString& pKey, const TTQRect& rValue  )
 {
 #ifndef QT_ONLY
     m_config->writeEntry(pKey, rValue   );
@@ -480,7 +480,7 @@ void Config::writeRectEntry( const TQString& pKey, const TQRect& rValue  )
 #endif 
  
 }
-void Config::writePointEntry( const TQString& pKey, const TQPoint& rValue  )
+void Config::writePointEntry( const TTQString& pKey, const TTQPoint& rValue  )
 {
 #ifndef QT_ONLY
     m_config->writeEntry(pKey, rValue   );
@@ -489,7 +489,7 @@ void Config::writePointEntry( const TQString& pKey, const TQPoint& rValue  )
 #endif 
  
 }
-void Config::writeSizeEntry( const TQString& pKey, const TQSize& rValue  )
+void Config::writeSizeEntry( const TTQString& pKey, const TTQSize& rValue  )
 {
 #ifndef QT_ONLY
     m_config->writeEntry(pKey, rValue    );
@@ -497,7 +497,7 @@ void Config::writeSizeEntry( const TQString& pKey, const TQSize& rValue  )
     writePropertyEntry(pKey,rValue);
 #endif 
 }
-void Config::writePathEntry( const TQString& pKey, const TQString & path  )
+void Config::writePathEntry( const TTQString& pKey, const TTQString & path  )
 {
 #ifndef QT_ONLY
     m_config->writePathEntry(pKey,path);
@@ -505,7 +505,7 @@ void Config::writePathEntry( const TQString& pKey, const TQString & path  )
     writeEntry(pKey,path);
 #endif
 }
-void Config::writePathListEntry( const TQString& pKey, const TQStringList &rValue   )
+void Config::writePathListEntry( const TTQString& pKey, const TTQStringList &rValue   )
 {
 #ifndef QT_ONLY
     m_config->writePathEntry(pKey,rValue);
@@ -513,7 +513,7 @@ void Config::writePathListEntry( const TQString& pKey, const TQStringList &rValu
     writeListEntry(pKey,rValue);
 #endif 
 }
-void Config::deleteEntry( const TQString& pKey, bool bNLS , bool bGlobal )
+void Config::deleteEntry( const TTQString& pKey, bool bNLS , bool bGlobal )
 {
 #ifndef QT_ONLY
     m_config->deleteEntry(pKey,bNLS,bGlobal);
@@ -523,7 +523,7 @@ void Config::deleteEntry( const TQString& pKey, bool bNLS , bool bGlobal )
     m_config->removeEntry(pKey);
 #endif 
 }
-bool Config::deleteGroup( const TQString& group, bool bDeep  , bool bGlobal  )
+bool Config::deleteGroup( const TTQString& 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 5eb99973..0e063cb0 100644
--- a/kjsembed/bindings/kconfig_imp.h
+++ b/kjsembed/bindings/kconfig_imp.h
@@ -36,7 +36,7 @@
 #ifndef QT_ONLY
 class KConfig;
 #else
-class TQSettings;
+class TTQSettings;
 #endif
 
 namespace KJSEmbed {
@@ -51,9 +51,9 @@ class Config : public BindingObject
     Q_PROPERTY( bool readDefaults READ readDefaults WRITE setReadDefaults )
 
 public:
-    Config( TQObject *parent=0, const char *name=0);
+    Config( TTQObject *parent=0, const char *name=0);
     /*
-    Config( TQObject *parent, const char *name,  const TQString& confName );
+    Config( TTQObject *parent, const char *name,  const TTQString& confName );
     */
     virtual ~Config();
 
@@ -70,62 +70,62 @@ public slots:
 
 	// Group
     void setDesktopGroup();
-    void setGroup(const TQString&);
-    TQString group();
-    TQStringList groupList();
-    TQString locale();
+    void setGroup(const TTQString&);
+    TTQString group();
+    TTQStringList groupList();
+    TTQString locale();
 
     void rollback( bool bDeep  );
     void sync();
-    bool hasKey( const TQString& key ) const;
-    bool entryIsImmutable(const TQString &key) const;
-    void revertToDefault(const TQString &key);
-    bool hasDefault(const TQString &key) const;
+    bool hasKey( const TTQString& key ) const;
+    bool entryIsImmutable(const TTQString &key) const;
+    void revertToDefault(const TTQString &key);
+    bool hasDefault(const TTQString &key) const;
 
     void setFileWriteMode(int mode);
-    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  );
+    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  );
 
 private:
 #ifndef QT_ONLY
     KConfig *m_config;
 #else
-    TQSettings *m_config;
-    TQString m_name;
+    TTQSettings *m_config;
+    TTQString m_name;
     bool m_forceGlobal;
 #endif
 };
diff --git a/kjsembed/bindings/movie_imp.cpp b/kjsembed/bindings/movie_imp.cpp
index 7f786c52..d5d7a3cd 100644
--- a/kjsembed/bindings/movie_imp.cpp
+++ b/kjsembed/bindings/movie_imp.cpp
@@ -27,21 +27,21 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-Movie::Movie( TQObject *parent, const char *name ) : BindingObject(parent, name)
+Movie::Movie( TTQObject *parent, const char *name ) : BindingObject(parent, name)
 {
-	movie = TQMovie();
+	movie = TTQMovie();
 }
 Movie::~Movie()
 {
 
 }
-TQColor Movie::backgroundColor() const
+TTQColor Movie::backgroundColor() const
 {
 	if( movie.isNull() )
-		return TQColor();
+		return TTQColor();
 	return movie.backgroundColor();
 }
-void Movie::setBackgroundColor( const TQColor &c )
+void Movie::setBackgroundColor( const TTQColor &c )
 {
 	if( movie.isNull() )
 		return;
@@ -59,30 +59,30 @@ void Movie::setSpeed( int percent )
 		return;
 	movie.setSpeed(percent);
 }
-bool Movie::load( const TQString &filename, int bufsize)
+bool Movie::load( const TTQString &filename, int bufsize)
 {
-	movie = TQMovie( filename, bufsize);
+	movie = TTQMovie( filename, bufsize);
 	if ( movie.isNull() )
 		return false;
 	else
 		return true;
 }
-TQRect Movie::getValidRect()
+TTQRect Movie::getValidRect()
 {
 	if( movie.isNull() )
-		return TQRect();
+		return TTQRect();
 	return movie.getValidRect();
 }
-TQPixmap Movie::framePixmap()
+TTQPixmap Movie::framePixmap()
 {
 	if( movie.isNull() )
-		return TQPixmap();
+		return TTQPixmap();
 	return movie.framePixmap();
 }
-TQImage Movie::frameImage()
+TTQImage Movie::frameImage()
 {
 	if( movie.isNull() )
-		return TQImage();
+		return TTQImage();
 	return movie.frameImage();
 }
 bool Movie::isNull()
diff --git a/kjsembed/bindings/movie_imp.h b/kjsembed/bindings/movie_imp.h
index 74508e99..96feffca 100644
--- a/kjsembed/bindings/movie_imp.h
+++ b/kjsembed/bindings/movie_imp.h
@@ -30,7 +30,7 @@ namespace KJSEmbed {
 namespace Bindings {
 
 /**
- * TQObject Binding for TQMovie.
+ * TTQObject Binding for TTQMovie.
  *
  * @author Ian Reinhart Geiser, geiseri@kde.org
  * @version $Id$
@@ -39,22 +39,22 @@ class Movie : public BindingObject
 {
     Q_OBJECT
 
-    Q_PROPERTY( TQColor setBackgroundColor READ backgroundColor )
+    Q_PROPERTY( TTQColor setBackgroundColor READ backgroundColor )
     Q_PROPERTY( int setSpeed READ speed )
 
 public:
-    Movie( TQObject *parent=0, const char *name=0 );
+    Movie( TTQObject *parent=0, const char *name=0 );
     virtual ~Movie();
-    TQColor backgroundColor() const;
-    void setBackgroundColor( const TQColor &c );
+    TTQColor backgroundColor() const;
+    void setBackgroundColor( const TTQColor &c );
     int speed() const;
     void setSpeed ( int percent );
 
 public slots:
-    bool load( const TQString &filename, int bufsize = 1024);
-    TQRect getValidRect();
-    TQPixmap framePixmap();
-    TQImage frameImage();
+    bool load( const TTQString &filename, int bufsize = 1024);
+    TTQRect getValidRect();
+    TTQPixmap framePixmap();
+    TTQImage frameImage();
     bool isNull();
     int frameNumber();
     int steps();
@@ -68,7 +68,7 @@ public slots:
     void restart();
 
 private:
-    TQMovie movie;
+    TTQMovie movie;
 };
 
 } // namespace
diff --git a/kjsembed/bindings/netaccess_imp.cpp b/kjsembed/bindings/netaccess_imp.cpp
index c7462e28..d9864710 100644
--- a/kjsembed/bindings/netaccess_imp.cpp
+++ b/kjsembed/bindings/netaccess_imp.cpp
@@ -32,7 +32,7 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-NetAccess::NetAccess( TQObject *parent, const char *name )
+NetAccess::NetAccess( TTQObject *parent, const char *name )
     : BindingObject( parent, name )
 {
 }
@@ -41,9 +41,9 @@ NetAccess::~NetAccess()
 {
 }
 
-bool NetAccess::download( const KURL& src, const TQString& loc )
+bool NetAccess::download( const KURL& src, const TTQString& loc )
 {
-    TQString mloc = loc;
+    TTQString 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 TQString& loc )
 #endif
 }
 
-TQString NetAccess::createTempFile( const TQString& prefix, const TQString& ext, uint mode )
+TTQString NetAccess::createTempFile( const TTQString& prefix, const TTQString& ext, uint mode )
 {
 	KTempFile tmpFile = KTempFile(prefix, ext, mode);
 	tmpFile.setAutoDelete(false);
 	return tmpFile.name();
 }
 
-void NetAccess::removeTempFile( const TQString& name )
+void NetAccess::removeTempFile( const TTQString& name )
 {
     KIO::NetAccess::removeTempFile( name );
 }
 
-bool NetAccess::upload( const TQString& src, const KURL& dest )
+bool NetAccess::upload( const TTQString& 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();
 }
 
-TQString NetAccess::fish_execute( const KURL& url, const TQString& command )
+TTQString NetAccess::fish_execute( const KURL& url, const TTQString& 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 TQString::null;
+    return TTQString::null;
 #endif
 }
 
-TQString NetAccess::mimetype( const KURL& url )
+TTQString NetAccess::mimetype( const KURL& url )
 {
     kdDebug()<<"mimetype CALLED "<<endl;
 
@@ -145,7 +145,7 @@ TQString NetAccess::mimetype( const KURL& url )
 #endif
 }
 
-TQString NetAccess::lastErrorString()
+TTQString NetAccess::lastErrorString()
 {
     return KIO::NetAccess::lastErrorString();
 }
diff --git a/kjsembed/bindings/netaccess_imp.h b/kjsembed/bindings/netaccess_imp.h
index 8a788af4..e2b696ca 100644
--- a/kjsembed/bindings/netaccess_imp.h
+++ b/kjsembed/bindings/netaccess_imp.h
@@ -37,13 +37,13 @@ class NetAccess : public BindingObject
 {
     Q_OBJECT
 public:
-    NetAccess( TQObject *parent, const char *name=0 );
+    NetAccess( TTQObject *parent, const char *name=0 );
     virtual ~NetAccess();
 public slots:
-    bool download( const KURL& src, const TQString & loc );
-    TQString createTempFile(const TQString& prefix, const TQString& ext, uint mode );
-    void removeTempFile( const TQString& name );
-    bool upload( const TQString& src, const KURL& dest );
+    bool download( const KURL& src, const TTQString & loc );
+    TTQString createTempFile(const TTQString& prefix, const TTQString& ext, uint mode );
+    void removeTempFile( const TTQString& name );
+    bool upload( const TTQString& src, const KURL& dest );
     bool copy( const KURL& src, const KURL& target );
     bool dircopy( const KURL& src, const KURL& target );
     bool move( const KURL& src, const KURL& target );
@@ -51,9 +51,9 @@ public slots:
     bool del( const KURL& url );
     int propertiesDialog( const KURL &url );
 
-    TQString fish_execute( const KURL& url, const TQString& command );
-    TQString mimetype( const KURL& url );
-    TQString lastErrorString();
+    TTQString fish_execute( const KURL& url, const TTQString& command );
+    TTQString mimetype( const KURL& url );
+    TTQString lastErrorString();
 };
 
 } // namespace Bindings
diff --git a/kjsembed/bindings/painter_imp.cpp b/kjsembed/bindings/painter_imp.cpp
index df6673e8..184529df 100644
--- a/kjsembed/bindings/painter_imp.cpp
+++ b/kjsembed/bindings/painter_imp.cpp
@@ -38,15 +38,15 @@ namespace Bindings {
     {
         PainterRef * p = new PainterRef();
         /*
-        TQWidget *w = extractQWidget(exec, args, 0);
-        TQPixmap pix = extractQPixmap(exec, args, 0);
+        TTQWidget *w = extractTQWidget(exec, args, 0);
+        TTQPixmap pix = extractTQPixmap(exec, args, 0);
         if( w )
         {
             p->setDevice(w);
             p->setCanDelete(false);
         }
         else if( !pix.isNull() )
-            p->setDevice( new TQPixmap(pix) );
+            p->setDevice( new TTQPixmap(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 TQPainter;
+	m_painter = new TTQPainter;
   m_canDelete = true;
 }
 PainterRef::~PainterRef()
@@ -74,17 +74,17 @@ PainterRef::~PainterRef()
 	delete m_painter;
 }
 
-TQPainter *PainterRef::painter()
+TTQPainter *PainterRef::painter()
 {
 	return m_painter;
 }
 
-TQPaintDevice *PainterRef::device()
+TTQPaintDevice *PainterRef::device()
 {
 	return m_device;
 }
 
-void PainterRef::setDevice(TQPaintDevice *d)
+void PainterRef::setDevice(TTQPaintDevice *d)
 {
   if( m_device && m_canDelete)
 	{
@@ -162,17 +162,17 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li
                 }
                 else
                 {
-                    TQString msg = i18n( "Paintdevice was not a valid widget." );
+                    TTQString msg = i18n( "Paintdevice was not a valid widget." );
                     throwError(exec,msg);
                     retValue =  KJS::Boolean(false);
                 }
             }
             else if ( vp )
             {
-                TQPixmap *p = new TQPixmap(vp->toVariant().toPixmap());
+                TTQPixmap *p = new TTQPixmap(vp->toVariant().toPixmap());
                 if( p->isNull() )
                 {
-                    TQString msg = i18n( "Cannto paint to a null pixmap." ).arg( op->typeName()  );
+                    TTQString 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() == "TQPaintDevice" )
+            else if ( op && op->typeName() == "TTQPaintDevice" )
             {
-                pr->setDevice( op->toNative<TQPaintDevice>() );
+                pr->setDevice( op->toNative<TTQPaintDevice>() );
                 pr->setCanDelete(false);
                 retValue = KJS::Boolean( begin() );
             }
             else
             {
-                TQString msg = i18n( "Paintdevice of type '%1' is not supported." ).arg( op->typeName()  );
+                TTQString msg = i18n( "Paintdevice of type '%1' is not supported." ).arg( op->typeName()  );
                 throwError(exec,msg);
                 retValue =  KJS::Boolean(false);
             }
         }
         else
         {
-            TQString msg = i18n( "Incorrect number of arguements '%1'." ).arg( args.size() );
+            TTQString 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:
     {
-        TQPen pn = extractQPen(exec, args, 0);
+        TTQPen pn = extractTQPen(exec, args, 0);
 	setPen(pn);
         break;
     }
@@ -227,7 +227,7 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li
     }
     case MethodtextBox:
     {
-        retValue = convertToValue(exec, textBox(extractQString(exec, args, 0)));
+        retValue = convertToValue(exec, textBox(extractTQString(exec, args, 0)));
 	break;
     }
     case MethodmoveTo:
@@ -267,7 +267,7 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li
     }
     case MethoddrawText:
     {
-        drawText(extractInt(exec, args, 0), extractInt(exec, args, 1), extractQString(exec, args, 2));
+        drawText(extractInt(exec, args, 0), extractInt(exec, args, 1), extractTQString(exec, args, 2));
 	break;
     }
     case MethoddrawArc:
@@ -282,17 +282,17 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li
     }
     case MethoddrawPixmap:
     {
-        drawPixmap(extractInt(exec, args, 0), extractInt(exec, args, 1), extractQPixmap(exec, args, 2), extractInt(exec, args, 3), extractInt(exec, args, 4), extractInt(exec, args, 5), extractInt(exec, args, 6));
+        drawPixmap(extractInt(exec, args, 0), extractInt(exec, args, 1), extractTQPixmap(exec, args, 2), extractInt(exec, args, 3), extractInt(exec, args, 4), extractInt(exec, args, 5), extractInt(exec, args, 6));
 	break;
     }
     case MethoddrawImage:
     {
-        drawImage( extractInt(exec, args, 0), extractInt(exec, args, 1), extractQImage(exec, args, 2), extractInt(exec, args, 3), extractInt(exec, args, 4), extractInt(exec, args, 5), extractInt(exec, args, 6), extractInt(exec, args, 7) );
+        drawImage( extractInt(exec, args, 0), extractInt(exec, args, 1), extractTQImage(exec, args, 2), extractInt(exec, args, 3), extractInt(exec, args, 4), extractInt(exec, args, 5), extractInt(exec, args, 6), extractInt(exec, args, 7) );
 	break;
     }
     case MethoddrawTiledPixmap:
     {
-        drawTiledPixmap(extractInt(exec, args, 0), extractInt(exec, args, 1), extractInt(exec, args, 2), extractInt(exec, args, 3), extractQPixmap(exec, args, 4), extractInt(exec, args, 5), extractInt(exec, args, 6));
+        drawTiledPixmap(extractInt(exec, args, 0), extractInt(exec, args, 1), extractInt(exec, args, 2), extractInt(exec, args, 3), extractTQPixmap(exec, args, 4), extractInt(exec, args, 5), extractInt(exec, args, 6));
 	break;
     }
     case Methodscale:
@@ -317,7 +317,7 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li
     }
     case MethodsetFont:
     {
-        setFont(extractQFont(exec, args, 0));
+        setFont(extractTQFont(exec, args, 0));
         break;
     }
     case Methodfont:
@@ -327,7 +327,7 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li
     }
     case MethodsetBrush:
     {
-    	pr->painter()->setBrush(extractQBrush(exec, args, 0));
+    	pr->painter()->setBrush(extractTQBrush(exec, args, 0));
         break;
     }
     case Methodbrush:
@@ -342,7 +342,7 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li
     }
     case MethodsetBackgroundColor:
     {
-        setBackgroundColor(extractQColor(exec, args, 0));
+        setBackgroundColor(extractTQColor(exec, args, 0));
 	break;
     }
     default:
@@ -367,7 +367,7 @@ bool Painter::begin()
 {
     return pr->painter()->begin(pr->device());
 }
-bool Painter::begin(TQPaintDevice *dev)
+bool Painter::begin(TTQPaintDevice *dev)
 {
     return pr->painter()->begin(dev);
 }
@@ -377,29 +377,29 @@ bool Painter::end()
     return pr->painter()->end();
 }
 
-TQPixmap Painter::pixmap() const
+TTQPixmap Painter::pixmap() const
 {
-   TQPixmap *pix = dynamic_cast<TQPixmap *>(pr->device());
+   TTQPixmap *pix = dynamic_cast<TTQPixmap *>(pr->device());
    if( pix )
    {
 	return *pix;
    }
-   return TQPixmap();
+   return TTQPixmap();
 }
 
-void Painter::setPen( const TQPen& pn )
+void Painter::setPen( const TTQPen& pn )
 {
     pr->painter()->setPen(pn);
 }
 
-TQPen Painter::pen() const
+TTQPen Painter::pen() const
 {
     return pr->painter()->pen();
 }
 
-TQRect Painter::textBox(const TQString &text)
+TTQRect Painter::textBox(const TTQString &text)
 {
-	TQFontMetrics fnt = pr->painter()->fontMetrics();
+	TTQFontMetrics 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 TQString &txt )
+void Painter::drawText( int x, int y, const TTQString &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 TQPixmap & pixmap, int sx, int sy, int sw, int sh )
+void Painter::drawPixmap ( int x, int y, const TTQPixmap & 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 TQImage &image, int sx , int sy, int sw , int sh, int conversionFlags)
+void Painter::drawImage ( int x, int y, const TTQImage &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 TQPixmap & pixmap, int sx, int sy )
+void Painter::drawTiledPixmap ( int x, int y, int w, int h, const TTQPixmap & 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 TQFont & font )
+void KJSEmbed::Bindings::Painter::setFont( const TTQFont & font )
 {
 	pr->painter()->setFont(font);
 }
 
-TQFont KJSEmbed::Bindings::Painter::font( ) const
+TTQFont KJSEmbed::Bindings::Painter::font( ) const
 {
 	return pr->painter()->font();
 }
 
-TQColor KJSEmbed::Bindings::Painter::backgroundColor( ) const
+TTQColor KJSEmbed::Bindings::Painter::backgroundColor( ) const
 {
 	return pr->painter()->backgroundColor();
 }
 
-void KJSEmbed::Bindings::Painter::setBackgroundColor( const TQColor & color )
+void KJSEmbed::Bindings::Painter::setBackgroundColor( const TTQColor & color )
 {
 	pr->painter()->setBackgroundColor(color);
 }
@@ -505,12 +505,12 @@ void KJSEmbed::Bindings::Painter::setBackgroundColor( const TQColor & color )
 } // namespace KJSEmbed
 
 
-void KJSEmbed::Bindings::Painter::setBrush( const TQColor & brush )
+void KJSEmbed::Bindings::Painter::setBrush( const TTQColor & brush )
 {
 	pr->painter()->setBrush(brush);
 }
 
-TQColor KJSEmbed::Bindings::Painter::brush( ) const
+TTQColor 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 f831b7fd..0f99a777 100644
--- a/kjsembed/bindings/painter_imp.h
+++ b/kjsembed/bindings/painter_imp.h
@@ -27,7 +27,7 @@
 #include <tqpen.h>
 #include <tqpainter.h>
 
-class TQPixmap;
+class TTQPixmap;
 
 namespace KJSEmbed {
 namespace Bindings {
@@ -46,22 +46,22 @@ class PainterRef
 		PainterRef();
 		~PainterRef();
 
-		TQPainter *painter();
+		TTQPainter *painter();
 
-		TQPaintDevice *device();
-		void setDevice(TQPaintDevice *d);
+		TTQPaintDevice *device();
+		void setDevice(TTQPaintDevice *d);
 
     void setCanDelete(bool can ) {m_canDelete = can;}
     bool canDelete() const { return m_canDelete;}
     
 	private:
-		TQPainter *m_painter;
-		TQPaintDevice *m_device;
+		TTQPainter *m_painter;
+		TTQPaintDevice *m_device;
     bool m_canDelete;
 };
 
 /**
- * JSProxyImp binding for painting on a TQPixmap.
+ * JSProxyImp binding for painting on a TTQPixmap.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -84,12 +84,12 @@ public:
 private:
 
     bool begin();
-    bool begin(TQPaintDevice *dev);
+    bool begin(TTQPaintDevice *dev);
     bool end();
-    TQPixmap pixmap() const;
-    void setPen( const TQPen& pn);
-    TQPen pen() const;
-    TQRect textBox(const TQString &text);
+    TTQPixmap pixmap() const;
+    void setPen( const TTQPen& pn);
+    TTQPen pen() const;
+    TTQRect textBox(const TTQString &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 TQString &txt );
+    void drawText( int x, int y, const TTQString &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 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 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 scale ( double sx, double sy );
     void shear ( double sh, double sv );
     void rotate ( double a );
     void translate ( double dx, double dy );
-    void setFont( const TQFont &font);
-    TQFont font() const;
-    void setBrush( const TQColor &brush );
-    TQColor brush() const;
-    TQColor backgroundColor() const;
-    void setBackgroundColor(const TQColor &color);
+    void setFont( const TTQFont &font);
+    TTQFont font() const;
+    void setBrush( const TTQColor &brush );
+    TTQColor brush() const;
+    TTQColor backgroundColor() const;
+    void setBackgroundColor(const TTQColor &color);
 
 private:
     int mid;
diff --git a/kjsembed/bindings/pen_imp.cpp b/kjsembed/bindings/pen_imp.cpp
index 25a38eee..8f9396bc 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, "TQPen") ) return;
+    if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TTQPen") ) 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, "TQPen") ) return KJS::Value();
+    if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TTQPen") ) return KJS::Value();
     JSValueProxy *op = JSProxy::toValueProxy( self.imp() );
-    TQPen pen = op->toVariant().toPen();
+    TTQPen 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:
     {
-    	TQColor color = extractQColor(exec, args, 0);
+    	TTQColor color = extractTQColor(exec, args, 0);
 	pen.setColor(color);
 	break;
     }
diff --git a/kjsembed/bindings/pixmap_imp.cpp b/kjsembed/bindings/pixmap_imp.cpp
index def51e3e..50396d3a 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, "TQPixmap") )
+    if( !JSProxy::checkType( object, JSProxy::ValueProxy, "TTQPixmap") )
         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, "TQPixmap") )
+    if( !JSProxy::checkType( self, JSProxy::ValueProxy, "TTQPixmap") )
         return KJS::Value();
 
     JSValueProxy *op = JSProxy::toValueProxy( self.imp() );
@@ -99,11 +99,11 @@ KJS::Value Pixmap::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Lis
         if( args.size() == 2)
 		resize(extractInt(exec, args, 0), extractInt(exec, args, 1));
 	else if( args.size() == 1)
-	    resize(extractQSize(exec, args, 0) );
+	    resize(extractTQSize(exec, args, 0) );
 	break;
     }
     case Methodfill:
-        fill( extractQColor(exec, args, 0));
+        fill( extractTQColor(exec, args, 0));
         break;
     case Methodmask:
     {
@@ -112,7 +112,7 @@ KJS::Value Pixmap::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Lis
     }
     case MethodsetMask:
     {
-       setMask(extractQPixmap(exec, args, 0));
+       setMask(extractTQPixmap(exec, args, 0));
        break;
     }
     case MethodcreateHeuristicMask:
@@ -144,35 +144,35 @@ void Pixmap::resize( int w, int h )
     pix.resize( w, h );
 }
 
-void Pixmap::resize( const TQSize &size )
+void Pixmap::resize( const TTQSize &size )
 {
     pix.resize( size );
 }
 
-void Pixmap::fill( const TQColor &c )
+void Pixmap::fill( const TTQColor &c )
 {
     pix.fill( c );
 }
 
 void Pixmap::grabWindow(int winID, int x, int y, int w, int h)
 {
-  pix = TQPixmap::grabWindow((WId)winID, x, y, w, h);
+  pix = TTQPixmap::grabWindow((WId)winID, x, y, w, h);
 }
 
-TQPixmap Pixmap::mask()
+TTQPixmap Pixmap::mask()
 {
 	return *(pix.mask());
 }
-void Pixmap::setMask(const TQPixmap& mask)
+void Pixmap::setMask(const TTQPixmap& mask)
 {
-	TQBitmap bm;
+	TTQBitmap bm;
 	bm = mask;
 	pix.setMask(bm);
 }
 
-TQPixmap Pixmap::createHeuristicMask ( bool clipTight )
+TTQPixmap Pixmap::createHeuristicMask ( bool clipTight )
 {
-	return (TQPixmap)pix.createHeuristicMask(clipTight);
+	return (TTQPixmap)pix.createHeuristicMask(clipTight);
 }
 
 } // namespace KJSEmbed::Bindings
diff --git a/kjsembed/bindings/pixmap_imp.h b/kjsembed/bindings/pixmap_imp.h
index 08baa96c..caffdd8f 100644
--- a/kjsembed/bindings/pixmap_imp.h
+++ b/kjsembed/bindings/pixmap_imp.h
@@ -30,7 +30,7 @@ namespace KJSEmbed {
 namespace Bindings {
 
 /**
- * TQObject Binding for TQPixmap.
+ * TTQObject Binding for TTQPixmap.
  *
  * @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(); }
-    TQSize size() const { return pix.size(); }
-    TQRect rect() const { return pix.rect(); }
+    TTQSize size() const { return pix.size(); }
+    TTQRect rect() const { return pix.rect(); }
 
     int depth() const { return pix.depth(); }
 
     void resize( int w, int h );
-    void resize( const TQSize &size );
-    void fill( const TQColor &color );
+    void resize( const TTQSize &size );
+    void fill( const TTQColor &color );
 
-    TQPixmap mask();
-    void setMask(const TQPixmap& mask);
-    TQPixmap createHeuristicMask ( bool clipTight );
+    TTQPixmap mask();
+    void setMask(const TTQPixmap& mask);
+    TTQPixmap createHeuristicMask ( bool clipTight );
 
     // Image Capture
     void grabWindow(int winID, int x =0, int y = 0, int w = -1, int h = -1);
 
 private:
     int mid;
-    TQPixmap pix;
+    TTQPixmap pix;
 };
 
 } // namespace
diff --git a/kjsembed/bindings/point_imp.cpp b/kjsembed/bindings/point_imp.cpp
index fff93aad..cc9d06af 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, "TQPoint") ) return;
+    if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TTQPoint") ) 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, "TQPoint") ) return KJS::Value();
+    if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TTQPoint") ) return KJS::Value();
     JSValueProxy *vp = JSProxy::toValueProxy( self.imp() );
     KJS::Value retValue = KJS::Value();
-    TQPoint val = vp->toVariant().toPoint();
+    TTQPoint val = vp->toVariant().toPoint();
 
     switch ( mid ) { 
       case Methodx:
@@ -75,7 +75,7 @@ namespace Bindings {
 	retValue = KJS::Number(val.manhattanLength());
 	break;
       default:
-	TQString msg = i18n( "Point has no method %1" ).arg(mid);
+	TTQString 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 eb392722..a36b6759 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, "TQRect") ) return;
+    if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TTQRect") ) 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, "TQRect") ) return KJS::Value();
+    if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TTQRect") ) return KJS::Value();
 
     KJS::Value retValue = KJS::Value();
     JSValueProxy *vp = JSProxy::toValueProxy( self.imp() );
 
-    TQRect val = vp->toVariant().toRect();
+    TTQRect val = vp->toVariant().toRect();
 
     switch ( mid ) {
       case Methodx:
@@ -91,10 +91,10 @@ namespace Bindings {
     val.setWidth(extractInt(exec, args, 0));
     break;
         case Methodcontains:
-            retValue = convertToValue( exec, val.contains( extractQRect(exec, args, 0), extractBool(exec, args, 1)) );
+            retValue = convertToValue( exec, val.contains( extractTQRect(exec, args, 0), extractBool(exec, args, 1)) );
     break;
         default:
-        TQString msg = i18n( "Rect has no method %1" ).arg(mid);
+        TTQString 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 d773507d..f2123eb7 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, "TQSize") ) return;
+    if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TTQSize") ) return;
 
     JSProxy::MethodTable methods[] = {
     { Methodwidth, "width"},
@@ -58,9 +58,9 @@ void Size::addBindings( KJS::ExecState *exec, KJS::Object &object ) {
     //
 
     JSProxy::EnumTable enums[] = {
-    { "ScaleFree", (int)TQSize::ScaleFree },
-    { "ScaleMin", (int)TQSize::ScaleMin },
-    { "ScaleMax", (int)TQSize::ScaleMax },
+    { "ScaleFree", (int)TTQSize::ScaleFree },
+    { "ScaleMin", (int)TTQSize::ScaleMin },
+    { "ScaleMax", (int)TTQSize::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, "TQSize") ) return KJS::Value();
+    if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TTQSize") ) return KJS::Value();
     KJS::Value retValue = KJS::Value();
     JSValueProxy *vp = JSProxy::toValueProxy( self.imp() );
-    TQSize val = vp->toVariant().toSize();
+    TTQSize 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 ) {
-                TQSize sz = extractQSize(exec, args, 0);
+                TTQSize sz = extractTQSize(exec, args, 0);
                 int mode = extractInt(exec, args, 1);
-                val.scale(sz, (TQSize::ScaleMode)mode);
+                val.scale(sz, (TTQSize::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, (TQSize::ScaleMode)mode);
+                val.scale(x,y, (TTQSize::ScaleMode)mode);
             }
             break;
         }
@@ -105,18 +105,18 @@ KJS::Value Size::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List
             break;
         case MethodexpandedTo:
         {
-            TQSize sz = extractQSize(exec, args, 0);
+            TTQSize sz = extractTQSize(exec, args, 0);
             retValue = convertToValue( exec, val.expandedTo(sz) );
             break;
         }
         case MethodboundedTo:
         {
-            TQSize sz = extractQSize(exec, args, 0);
+            TTQSize sz = extractTQSize(exec, args, 0);
             retValue = convertToValue( exec, val.boundedTo(sz) );
             break;
         }
         default:
-            TQString msg = i18n( "Size has no method %1" ).arg(mid);
+            TTQString 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 5fa9782f..3d7e9578 100644
--- a/kjsembed/bindings/sql_imp.cpp
+++ b/kjsembed/bindings/sql_imp.cpp
@@ -30,44 +30,44 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-SqlDatabase::SqlDatabase( TQObject *parent, const char *name): BindingObject(parent, name)
+SqlDatabase::SqlDatabase( TTQObject *parent, const char *name): BindingObject(parent, name)
 {
 	connectionName = "defaultConnection";
 	setJSClassName( "SqlDatabase" );
 }
 SqlDatabase::~SqlDatabase()
 {
-	TQSqlDatabase::removeDatabase(connectionName);
+	TTQSqlDatabase::removeDatabase(connectionName);
 }
-bool SqlDatabase::addDatabase ( const TQString &type, const TQString &conn )
+bool SqlDatabase::addDatabase ( const TTQString &type, const TTQString &conn )
 {
 	connectionName = conn;
-	TQSqlDatabase *db = TQSqlDatabase::addDatabase(type, connectionName);
+	TTQSqlDatabase *db = TTQSqlDatabase::addDatabase(type, connectionName);
 	if ( !db )
 		return false;
 	return true;
 }
-TQStringList SqlDatabase::drivers ()
+TTQStringList SqlDatabase::drivers ()
 {
-	return TQSqlDatabase::drivers();
+	return TTQSqlDatabase::drivers();
 }
 bool SqlDatabase::open ( )
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->open();
 	return false;
 }
-bool SqlDatabase::open ( const TQString &user, const TQString &password )
+bool SqlDatabase::open ( const TTQString &user, const TTQString &password )
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->open(user, password);
 	return false;
 }
 void SqlDatabase::close ()
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 	{
 		db->close();
@@ -75,28 +75,28 @@ void SqlDatabase::close ()
 }
 bool SqlDatabase::isOpen ()
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->isOpen();
 	return false;
 }
 bool SqlDatabase::isOpenError ()
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->isOpenError();
 	return true;
 }
-TQStringList SqlDatabase::tables ()
+TTQStringList SqlDatabase::tables ()
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->tables();
-	return TQStringList();
+	return TTQStringList();
 }
-SqlQuery *SqlDatabase::exec (const TQString &query  )
+SqlQuery *SqlDatabase::exec (const TTQString &query  )
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 	{
 		kdDebug() <<" exec query " << query << endl;
@@ -108,9 +108,9 @@ SqlQuery *SqlDatabase::exec (const TQString &query  )
 	}
 	return 0L;
 }
-TQString  SqlDatabase::lastError () const
+TTQString  SqlDatabase::lastError () const
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 	{
 		return db->lastError().text();
@@ -119,105 +119,105 @@ TQString  SqlDatabase::lastError () const
 }
 bool SqlDatabase::transaction ()
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->transaction();
 	return false;
 }
 bool SqlDatabase::commit ()
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->commit();
 	return false;
 }
 bool SqlDatabase::rollback ()
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->rollback();
 	return false;
 }
-void SqlDatabase::setDatabaseName (const TQString &name )
+void SqlDatabase::setDatabaseName (const TTQString &name )
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		db->setDatabaseName(name);
 }
-void SqlDatabase::setUserName (const TQString &name )
+void SqlDatabase::setUserName (const TTQString &name )
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		db->setUserName(name);
 }
-void SqlDatabase::setPassword (const TQString &password )
+void SqlDatabase::setPassword (const TTQString &password )
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		db->setPassword(password);
 }
-void SqlDatabase::setHostName (const TQString &host )
+void SqlDatabase::setHostName (const TTQString &host )
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		db->setHostName(host);
 }
 void SqlDatabase::setPort ( int p )
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		db->setPort(p);
 }
-TQString SqlDatabase::databaseName () const
+TTQString SqlDatabase::databaseName () const
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->databaseName();
 	return "";
 }
-TQString SqlDatabase::userName () const
+TTQString SqlDatabase::userName () const
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->userName();
 	return "";
 }
-TQString SqlDatabase::password () const
+TTQString SqlDatabase::password () const
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->password();
 	return "";
 }
-TQString SqlDatabase::hostName () const
+TTQString SqlDatabase::hostName () const
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->hostName();
 	return "";
 }
-TQString SqlDatabase::driverName () const
+TTQString SqlDatabase::driverName () const
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->driverName();
 	return "";
 }
 int SqlDatabase::port () const
 {
-	TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false);
+	TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false);
 	if ( db )
 		return db->port();
 	return 0;
 }
 
-SqlQuery::SqlQuery( TQObject *parent, const char *name ): BindingObject(parent, name)
+SqlQuery::SqlQuery( TTQObject *parent, const char *name ): BindingObject(parent, name)
 {
 	kdDebug() << "New null SQL Query" << endl;
-	m_query = TQSqlQuery();
+	m_query = TTQSqlQuery();
 	setJSClassName( "SqlQuery" );
 }
-SqlQuery::SqlQuery(  TQObject *parent, const char *name, const TQSqlQuery &q ): BindingObject(parent, name)
+SqlQuery::SqlQuery(  TTQObject *parent, const char *name, const TTQSqlQuery &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();
 }
-TQString SqlQuery::lastQuery () const
+TTQString 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();
 }
-TQString  SqlQuery::lastError () const
+TTQString  SqlQuery::lastError () const
 {
 	return m_query.lastError().text();
 }
@@ -273,11 +273,11 @@ int SqlQuery::size () const
 {
 	return m_query.size();
 }
-bool SqlQuery::exec ( const TQString & query )
+bool SqlQuery::exec ( const TTQString & query )
 {
 	return m_query.exec( query );
 }
-TQVariant SqlQuery::value ( int i )
+TTQVariant SqlQuery::value ( int i )
 {
 	return m_query.value(i);
 }
diff --git a/kjsembed/bindings/sql_imp.h b/kjsembed/bindings/sql_imp.h
index f2fa6e6d..c99558f8 100644
--- a/kjsembed/bindings/sql_imp.h
+++ b/kjsembed/bindings/sql_imp.h
@@ -28,7 +28,7 @@ namespace KJSEmbed {
 namespace Bindings {
 
 /**
- * TQObject Binding for QSQLQuery.
+ * TTQObject 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( TQString lastError READ lastError)
-	Q_PROPERTY( TQString lastQuery READ lastQuery)
+	Q_PROPERTY( TTQString lastError READ lastError)
+	Q_PROPERTY( TTQString lastQuery READ lastQuery)
 
 public:
-	SqlQuery( TQObject *parent=0, const char *name=0 );
-	SqlQuery( TQObject *parent, const char *name, const TQSqlQuery &q );
+	SqlQuery( TTQObject *parent=0, const char *name=0 );
+	SqlQuery( TTQObject *parent, const char *name, const TTQSqlQuery &q );
 	//SqlQuery( const SqlQuery &copy);
 	virtual ~SqlQuery();
 
-	TQSqlQuery query(){ return m_query; }
-	void setQuery(const TQSqlQuery &q) {m_query = TQSqlQuery(q); }
+	TTQSqlQuery query(){ return m_query; }
+	void setQuery(const TTQSqlQuery &q) {m_query = TTQSqlQuery(q); }
 
 	int size () const;
 	bool isSelect () const;
@@ -60,16 +60,16 @@ public:
 	bool isActive () const;
 	int at () const;
 	int numRowsAffected () const;
-	TQString lastError () const;
-	TQString lastQuery () const;
+	TTQString lastError () const;
+	TTQString lastQuery () const;
 
 public slots:
 
 
 
 	bool isNull ( int field );
-	bool exec ( const TQString & m_query );
-	TQVariant value ( int i );
+	bool exec ( const TTQString & m_query );
+	TTQVariant value ( int i );
 	bool seek ( int i, bool relative = FALSE );
 	bool next ();
 	bool prev ();
@@ -77,11 +77,11 @@ public slots:
 	bool last ();
 
 private:
-	TQSqlQuery m_query;
+	TTQSqlQuery m_query;
 };
 
 /**
- * TQObject Binding for QSQLDatabase.
+ * TTQObject 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( 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( 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( int port READ port WRITE setPort)
-    Q_PROPERTY( TQString  driverName READ driverName)
-    Q_PROPERTY( TQString  lastError READ lastError)
+    Q_PROPERTY( TTQString  driverName READ driverName)
+    Q_PROPERTY( TTQString  lastError READ lastError)
 
 public:
-	SqlDatabase( TQObject *parent=0, const char *name=0 );
+	SqlDatabase( TTQObject *parent=0, const char *name=0 );
 	virtual ~SqlDatabase();
 
 
 public slots:
-	void setDatabaseName (const TQString &name );
-	void setUserName (const TQString &name );
-	void setPassword (const TQString &password );
-	void setHostName (const TQString &host );
+	void setDatabaseName (const TTQString &name );
+	void setUserName (const TTQString &name );
+	void setPassword (const TTQString &password );
+	void setHostName (const TTQString &host );
 	void setPort ( int p );
-	TQString databaseName () const;
-	TQString userName () const;
-	TQString password () const;
-	TQString hostName () const;
+	TTQString databaseName () const;
+	TTQString userName () const;
+	TTQString password () const;
+	TTQString hostName () const;
 	int port () const;
-	TQString driverName () const;
+	TTQString driverName () const;
 	
-	bool addDatabase ( const TQString & type, const TQString & connectionName = TQSqlDatabase::defaultConnection );
-	TQStringList drivers ();
+	bool addDatabase ( const TTQString & type, const TTQString & connectionName = TTQSqlDatabase::defaultConnection );
+	TTQStringList drivers ();
 	bool open ();
-	bool open ( const TQString &user, const TQString &password );
+	bool open ( const TTQString &user, const TTQString &password );
 	void close ();
 	bool isOpen ();
 	bool isOpenError ();
-	TQStringList tables ();
-	SqlQuery *exec( const TQString &query );
-	TQString  lastError () const;
+	TTQStringList tables ();
+	SqlQuery *exec( const TTQString &query );
+	TTQString  lastError () const;
 	bool transaction ();
 	bool commit ();
 	bool rollback ();
 
 private:
-	TQString connectionName;
-	//TQSqlDatabase *db;
+	TTQString connectionName;
+	//TTQSqlDatabase *db;
 };
 
 
diff --git a/kjsembed/bindwizard/Doxyfile.in b/kjsembed/bindwizard/Doxyfile.in
index 291c78cd..d9574b64 100644
--- a/kjsembed/bindwizard/Doxyfile.in
+++ b/kjsembed/bindwizard/Doxyfile.in
@@ -171,7 +171,7 @@ SHOW_INCLUDE_FILES     = YES
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
 # will interpret the first line (until the first dot) of a JavaDoc-style 
 # comment as the brief description. If set to NO, the JavaDoc 
-# comments  will behave just like the Qt-style comments (thus requiring an 
+# comments  will behave just like the Qt-style comments (thus retquiring an 
 # explict @brief command for a brief description.
 
 JAVADOC_AUTOBRIEF      = YES
@@ -265,10 +265,10 @@ SHOW_USED_FILES        = YES
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated 
+# 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.
 
-QUIET                  = YES
+TTQUIET                  = 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 
@@ -470,7 +470,7 @@ ENUM_VALUES_PER_LINE   = 4
 # If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
 # generated containing a tree-like index structure (just like the one that 
 # is generated for HTML Help). For this to work a browser that supports 
-# JavaScript and frames is required (for instance Netscape 4.0+ 
+# JavaScript and frames is retquired (for instance Netscape 4.0+ 
 # or Internet explorer 4.0+).
 
 GENERATE_TREEVIEW      = NO
diff --git a/kjsembed/bindwizard/binding_wizard.ui b/kjsembed/bindwizard/binding_wizard.ui
index f6697bd3..9861a3d7 100644
--- a/kjsembed/bindwizard/binding_wizard.ui
+++ b/kjsembed/bindwizard/binding_wizard.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>binding_wizard</class>
-<widget class="QWizard">
+<widget class="TQWizard">
     <property name="name">
         <cstring>binding_wizard</cstring>
     </property>
@@ -23,7 +23,7 @@
     <property name="caption">
         <string>KJSEmbed Binding Wizard</string>
     </property>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>WizardPage</cstring>
         </property>
@@ -34,7 +34,7 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
                 <property name="name">
                     <cstring>textLabel1</cstring>
                 </property>
@@ -85,7 +85,7 @@ files of the C++ classes you want to make available to Javascript are located.</
                     </size>
                 </property>
             </spacer>
-            <widget class="QLabel" row="2" column="0">
+            <widget class="TQLabel" row="2" column="0">
                 <property name="name">
                     <cstring>textLabel3</cstring>
                 </property>
@@ -93,7 +93,7 @@ files of the C++ classes you want to make available to Javascript are located.</
                     <string>Header files:</string>
                 </property>
             </widget>
-            <widget class="QLabel" row="3" column="0">
+            <widget class="TQLabel" row="3" column="0">
                 <property name="name">
                     <cstring>textLabel2</cstring>
                 </property>
@@ -101,7 +101,7 @@ files of the C++ classes you want to make available to Javascript are located.</
                     <string>Plugin name:</string>
                 </property>
             </widget>
-            <widget class="QLabel" row="4" column="0">
+            <widget class="TQLabel" row="4" column="0">
                 <property name="name">
                     <cstring>textLabel2_2</cstring>
                 </property>
@@ -188,7 +188,7 @@ files of the C++ classes you want to make available to Javascript are located.</
             </widget>
         </grid>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>WizardPage</cstring>
         </property>
@@ -250,7 +250,7 @@ files of the C++ classes you want to make available to Javascript are located.</
                     </size>
                 </property>
             </spacer>
-            <widget class="QLabel" row="1" column="0">
+            <widget class="TQLabel" row="1" column="0">
                 <property name="name">
                     <cstring>analysing_label</cstring>
                 </property>
@@ -275,7 +275,7 @@ files of the C++ classes you want to make available to Javascript are located.</
                     </size>
                 </property>
             </spacer>
-            <widget class="QLayoutWidget" row="1" column="1">
+            <widget class="TQLayoutWidget" row="1" column="1">
                 <property name="name">
                     <cstring>layout1</cstring>
                 </property>
@@ -296,7 +296,7 @@ files of the C++ classes you want to make available to Javascript are located.</
                             </sizepolicy>
                         </property>
                     </widget>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>analyse_status</cstring>
                         </property>
@@ -314,7 +314,7 @@ files of the C++ classes you want to make available to Javascript are located.</
             </widget>
         </grid>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>WizardPage</cstring>
         </property>
@@ -325,7 +325,7 @@ files of the C++ classes you want to make available to Javascript are located.</
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                 <property name="name">
                     <cstring>textLabel6</cstring>
                 </property>
@@ -393,7 +393,7 @@ files of the C++ classes you want to make available to Javascript are located.</
             </spacer>
         </grid>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>WizardPage</cstring>
         </property>
@@ -404,7 +404,7 @@ files of the C++ classes you want to make available to Javascript are located.</
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QTextEdit" row="0" column="0">
+            <widget class="TQTextEdit" row="0" column="0">
                 <property name="name">
                     <cstring>output</cstring>
                 </property>
@@ -423,14 +423,14 @@ files of the C++ classes you want to make available to Javascript are located.</
             </widget>
         </grid>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>WizardPage</cstring>
         </property>
         <attribute name="title">
             <string>Results</string>
         </attribute>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel3_2</cstring>
             </property>
diff --git a/kjsembed/bindwizard/doxygen2imp_cpp.xsl b/kjsembed/bindwizard/doxygen2imp_cpp.xsl
index c65b5650..23729848 100644
--- a/kjsembed/bindwizard/doxygen2imp_cpp.xsl
+++ b/kjsembed/bindwizard/doxygen2imp_cpp.xsl
@@ -27,7 +27,7 @@
 #include &lt;kjsembed/jsbinding.h>
 
 #include &lt;<xsl:value-of select="includes" />>
-#include "<xsl:value-of select="translate($clazz,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')"/>_imp.h"
+#include "<xsl:value-of select="translate($clazz,'ABCDEFGHIJKLMNOPTQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')"/>_imp.h"
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -60,7 +60,7 @@ void <xsl:value-of select="$clazz" />Imp::addStaticBindings( KJS::ExecState *exe
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -117,7 +117,7 @@ void <xsl:value-of select="$clazz" />Imp::addBindings( KJS::ExecState *exec, KJS
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -136,7 +136,7 @@ void <xsl:value-of select="$clazz" />Imp::addBindings( KJS::ExecState *exec, KJS
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
            return dynamic_cast&lt;<xsl:value-of select="$clazz" /> *>( obj );
     }
@@ -172,7 +172,7 @@ KJS::Object <xsl:value-of select="$clazz" />Imp::construct( KJS::ExecState *exec
              break;
     }
 
-    QString msg = i18n("<xsl:value-of select="$clazz" />Cons has no constructor with id '%1'").arg(id);
+    TQString msg = i18n("<xsl:value-of select="$clazz" />Cons has no constructor with id '%1'").arg(id);
     KJS::Object err = KJS::Error::create( exec, KJS::ReferenceError, msg.utf8() );
     exec->setException( err );
     return err;
@@ -186,7 +186,7 @@ KJS::Object <xsl:value-of select="$clazz" />Imp::construct( KJS::ExecState *exec
    <xsl:variable name="cons_id">Constructor_<xsl:value-of select="$cons_name" /></xsl:variable>
 KJS::Object <xsl:value-of select="$clazz" />Imp::<xsl:value-of select="$cons_name" />( KJS::ExecState *exec, const KJS::List &amp;args )
 {
-    <xsl:if test="($clazz = 'QCanvasItem') or ($clazz = 'QCanvasPolygonalItem')">
+    <xsl:if test="($clazz = 'TQCanvasItem') or ($clazz = 'TQCanvasPolygonalItem')">
 #if 0 // This constructor has been disabled by the XSL template
     </xsl:if>
 
@@ -195,17 +195,17 @@ KJS::Object <xsl:value-of select="$clazz" />Imp::<xsl:value-of select="$cons_nam
       <xsl:variable name="idx" select="position()-1" />
 
       <xsl:choose>
-        <xsl:when test=". = 'QString'">
-    QString arg<xsl:value-of select="$idx" /> = extractQString(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'TQString'">
+    TQString arg<xsl:value-of select="$idx" /> = extractTQString(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QString &amp;'">
-    QString arg<xsl:value-of select="$idx" /> = extractQString(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQString &amp;'">
+    TQString arg<xsl:value-of select="$idx" /> = extractTQString(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'QString &amp;'">
-    QString arg<xsl:value-of select="$idx" /> = extractQString(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'TQString &amp;'">
+    TQString arg<xsl:value-of select="$idx" /> = extractTQString(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QCString &amp;'">
-    const QCString arg<xsl:value-of select="$idx" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="$idx" />].toString(exec).ascii() : 0;
+        <xsl:when test=". = 'const TQCString &amp;'">
+    const TQCString arg<xsl:value-of select="$idx" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="$idx" />].toString(exec).ascii() : 0;
         </xsl:when>
         <xsl:when test=". = 'const char *'">
     const char *arg<xsl:value-of select="$idx" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="$idx" />].toString(exec).ascii() : 0;
@@ -222,48 +222,48 @@ KJS::Object <xsl:value-of select="$clazz" />Imp::<xsl:value-of select="$cons_nam
         <xsl:when test=". = 'bool'">
     bool arg<xsl:value-of select="$idx" /> = extractBool(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QFont &amp;'">
-    QFont arg<xsl:value-of select="$idx" /> = extractQFont(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQFont &amp;'">
+    TQFont arg<xsl:value-of select="$idx" /> = extractTQFont(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QPalette &amp;'">
-    QPalette arg<xsl:value-of select="$idx" /> = extractQPalette(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQPalette &amp;'">
+    TQPalette arg<xsl:value-of select="$idx" /> = extractTQPalette(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QStringList &amp;'">
-    QStringList arg<xsl:value-of select="$idx" /> = extractQStringList(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQStringList &amp;'">
+    TQStringList arg<xsl:value-of select="$idx" /> = extractTQStringList(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QStrList &amp;'">
-    QStrList arg<xsl:value-of select="$idx" /> = extractQStrList(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQStrList &amp;'">
+    TQStrList arg<xsl:value-of select="$idx" /> = extractTQStrList(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QPoint &amp;'">
-    QPoint arg<xsl:value-of select="$idx" /> = extractQPoint(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQPoint &amp;'">
+    TQPoint arg<xsl:value-of select="$idx" /> = extractTQPoint(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QRect &amp;'">
-    QRect arg<xsl:value-of select="$idx" /> = extractQRect(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQRect &amp;'">
+    TQRect arg<xsl:value-of select="$idx" /> = extractTQRect(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QSize &amp;'">
-    QSize arg<xsl:value-of select="$idx" /> = extractQSize(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQSize &amp;'">
+    TQSize arg<xsl:value-of select="$idx" /> = extractTQSize(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QPixmap &amp;'">
-    QPixmap arg<xsl:value-of select="$idx" /> = extractQPixmap(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQPixmap &amp;'">
+    TQPixmap arg<xsl:value-of select="$idx" /> = extractTQPixmap(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QImage &amp;'">
-    QImage arg<xsl:value-of select="$idx" /> = extractQImage(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQImage &amp;'">
+    TQImage arg<xsl:value-of select="$idx" /> = extractTQImage(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QColor &amp;'">
-    QColor arg<xsl:value-of select="$idx" /> = extractQColor(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQColor &amp;'">
+    TQColor arg<xsl:value-of select="$idx" /> = extractTQColor(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QDate &amp;'">
-    QDate arg<xsl:value-of select="$idx" /> = extractQDate(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQDate &amp;'">
+    TQDate arg<xsl:value-of select="$idx" /> = extractTQDate(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QTime &amp;'">
-    QTime arg<xsl:value-of select="$idx" /> = extractQTime(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQTime &amp;'">
+    TQTime arg<xsl:value-of select="$idx" /> = extractTQTime(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QDateTime &amp;'">
-    QDateTime arg<xsl:value-of select="$idx" /> = extractQDateTime(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQDateTime &amp;'">
+    TQDateTime arg<xsl:value-of select="$idx" /> = extractTQDateTime(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
 
         <xsl:when test=". = 'WFlags'">
-    Qt::WFlags arg<xsl:value-of select="$idx" />; // TODO (hack for QCanvasView)
+    TQt::WFlags arg<xsl:value-of select="$idx" />; // TODO (hack for TQCanvasView)
         </xsl:when>
 
         <xsl:otherwise>
@@ -282,7 +282,7 @@ KJS::Object <xsl:value-of select="$clazz" />Imp::<xsl:value-of select="$cons_nam
           arg<xsl:value-of select="position()-1" /><xsl:if test="position() != count(../param)">,</xsl:if>
        </xsl:for-each> );
 
-    <xsl:if test="($clazz = 'QCanvasItem') or ($clazz = 'QCanvasPolygonalItem')">
+    <xsl:if test="($clazz = 'TQCanvasItem') or ($clazz = 'TQCanvasPolygonalItem')">
 #endif // This constructor has been disabled by the XSL template
     </xsl:if>
 }
@@ -311,7 +311,7 @@ KJS::Value <xsl:value-of select="$clazz" />Imp::call( KJS::ExecState *exec, KJS:
         break;
     }
 
-    QString msg = i18n( "<xsl:value-of select="$clazz" />Imp has no method with id '%1'" ).arg( id );
+    TQString msg = i18n( "<xsl:value-of select="$clazz" />Imp has no method with id '%1'" ).arg( id );
     KJS::Object err = KJS::Error::create( exec, KJS::ReferenceError, msg.utf8() );
     exec->setException( err );
     return err;
@@ -333,17 +333,17 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object
       <xsl:variable name="idx" select="position()-1" />
 
       <xsl:choose>
-        <xsl:when test=". = 'QString'">
-    QString arg<xsl:value-of select="$idx" /> = extractQString(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'TQString'">
+    TQString arg<xsl:value-of select="$idx" /> = extractTQString(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QString &amp;'">
-    QString arg<xsl:value-of select="$idx" /> = extractQString(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQString &amp;'">
+    TQString arg<xsl:value-of select="$idx" /> = extractTQString(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'QString &amp;'">
-    QString arg<xsl:value-of select="$idx" /> = extractQString(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'TQString &amp;'">
+    TQString arg<xsl:value-of select="$idx" /> = extractTQString(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QCString &amp;'">
-    const QCString arg<xsl:value-of select="$idx" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="$idx" />].toString(exec).ascii() : 0;
+        <xsl:when test=". = 'const TQCString &amp;'">
+    const TQCString arg<xsl:value-of select="$idx" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="$idx" />].toString(exec).ascii() : 0;
         </xsl:when>
         <xsl:when test=". = 'const char *'">
     const char *arg<xsl:value-of select="$idx" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="$idx" />].toString(exec).ascii() : 0;
@@ -360,92 +360,92 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object
         <xsl:when test=". = 'bool'">
     bool arg<xsl:value-of select="$idx" /> = extractBool(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QFont &amp;'">
-    QFont arg<xsl:value-of select="$idx" /> = extractQFont(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQFont &amp;'">
+    TQFont arg<xsl:value-of select="$idx" /> = extractTQFont(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QPalette &amp;'">
-    QPalette arg<xsl:value-of select="$idx" /> = extractQPalette(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQPalette &amp;'">
+    TQPalette arg<xsl:value-of select="$idx" /> = extractTQPalette(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QStringList &amp;'">
-    QStringList arg<xsl:value-of select="$idx" /> = extractQStringList(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQStringList &amp;'">
+    TQStringList arg<xsl:value-of select="$idx" /> = extractTQStringList(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QStrList &amp;'">
-    QStrList arg<xsl:value-of select="$idx" /> = extractQStrList(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQStrList &amp;'">
+    TQStrList arg<xsl:value-of select="$idx" /> = extractTQStrList(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QPoint &amp;'">
-    QPoint arg<xsl:value-of select="$idx" /> = extractQPoint(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQPoint &amp;'">
+    TQPoint arg<xsl:value-of select="$idx" /> = extractTQPoint(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QRect &amp;'">
-    QRect arg<xsl:value-of select="$idx" /> = extractQRect(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQRect &amp;'">
+    TQRect arg<xsl:value-of select="$idx" /> = extractTQRect(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QSize &amp;'">
-    QSize arg<xsl:value-of select="$idx" /> = extractQSize(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQSize &amp;'">
+    TQSize arg<xsl:value-of select="$idx" /> = extractTQSize(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QPixmap &amp;'">
-    QPixmap arg<xsl:value-of select="$idx" /> = extractQPixmap(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQPixmap &amp;'">
+    TQPixmap arg<xsl:value-of select="$idx" /> = extractTQPixmap(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QImage &amp;'">
-    QImage arg<xsl:value-of select="$idx" /> = extractQImage(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQImage &amp;'">
+    TQImage arg<xsl:value-of select="$idx" /> = extractTQImage(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QColor &amp;'">
-    QColor arg<xsl:value-of select="$idx" /> = extractQColor(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQColor &amp;'">
+    TQColor arg<xsl:value-of select="$idx" /> = extractTQColor(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QDate &amp;'">
-    QDate arg<xsl:value-of select="$idx" /> = extractQDate(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQDate &amp;'">
+    TQDate arg<xsl:value-of select="$idx" /> = extractTQDate(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QTime &amp;'">
-    QTime arg<xsl:value-of select="$idx" /> = extractQTime(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQTime &amp;'">
+    TQTime arg<xsl:value-of select="$idx" /> = extractTQTime(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
-        <xsl:when test=". = 'const QDateTime &amp;'">
-    QDateTime arg<xsl:value-of select="$idx" /> = extractQDateTime(exec, args, <xsl:value-of select="$idx" />);
+        <xsl:when test=". = 'const TQDateTime &amp;'">
+    TQDateTime arg<xsl:value-of select="$idx" /> = extractTQDateTime(exec, args, <xsl:value-of select="$idx" />);
         </xsl:when>
 
 	<!-- Hacks for enum types, this should be handled in a much cleaner way. -->
 
         <xsl:when test=". = 'Policy'">
-    QComboBox::Policy arg<xsl:value-of select="$idx" />; // TODO (hack for combo box)
+    TQComboBox::Policy arg<xsl:value-of select="$idx" />; // TODO (hack for combo box)
         </xsl:when>
         <xsl:when test=". = 'Shape'">
-    QFrame::Shape arg<xsl:value-of select="$idx" />; // TODO (hack for frame)
+    TQFrame::Shape arg<xsl:value-of select="$idx" />; // TODO (hack for frame)
         </xsl:when>
         <xsl:when test=". = 'Shadow'">
-    QFrame::Shadow arg<xsl:value-of select="$idx" />; // TODO (hack for frame)
+    TQFrame::Shadow arg<xsl:value-of select="$idx" />; // TODO (hack for frame)
         </xsl:when>
         <xsl:when test=". = 'FILE *'">
     FILE *arg<xsl:value-of select="$idx" />; // TODO (hack for qfile)
         </xsl:when>
         <xsl:when test=". = 'Offset'">
-    QFile::Offset arg<xsl:value-of select="$idx" />; // TODO (hack for qfile)
+    TQFile::Offset arg<xsl:value-of select="$idx" />; // TODO (hack for qfile)
         </xsl:when>
         <xsl:when test=". = 'EncoderFn'">
-    QFile::EncoderFn arg<xsl:value-of select="$idx" />; // TODO (hack for qfile)
+    TQFile::EncoderFn arg<xsl:value-of select="$idx" />; // TODO (hack for qfile)
         </xsl:when>
         <xsl:when test=". = 'DecoderFn'">
-    QFile::DecoderFn arg<xsl:value-of select="$idx" />; // TODO (hack for qfile)
+    TQFile::DecoderFn arg<xsl:value-of select="$idx" />; // TODO (hack for qfile)
         </xsl:when>
         <xsl:when test=". = 'FrameAnimationType'">
-    QCanvasSprite::FrameAnimationType arg<xsl:value-of select="$idx" />; // TODO (hack for QCanvasSprite)
+    TQCanvasSprite::FrameAnimationType arg<xsl:value-of select="$idx" />; // TODO (hack for TQCanvasSprite)
         </xsl:when>
         <xsl:when test=". = 'WFlags'">
-    Qt::WFlags arg<xsl:value-of select="$idx" />; // TODO (hack for QCanvasView)
+    TQt::WFlags arg<xsl:value-of select="$idx" />; // TODO (hack for TQCanvasView)
         </xsl:when>
 
 	<!-- Unsupported for now -->
 
-        <xsl:when test=". = 'const QByteArray &amp;'">
-    QByteArray arg<xsl:value-of select="$idx" />; // TODO (hack for qfile)
+        <xsl:when test=". = 'const TQByteArray &amp;'">
+    TQByteArray arg<xsl:value-of select="$idx" />; // TODO (hack for qfile)
         </xsl:when>
-        <xsl:when test=". = 'const QPointArray &amp;'">
-    QPointArray arg<xsl:value-of select="$idx" />; // TODO (hack for qcanvas)
+        <xsl:when test=". = 'const TQPointArray &amp;'">
+    TQPointArray arg<xsl:value-of select="$idx" />; // TODO (hack for qcanvas)
         </xsl:when>
-        <xsl:when test=". = 'QPainter &amp;'">
-    QPainter arg<xsl:value-of select="$idx" />; // TODO (hack for qcanvas)
+        <xsl:when test=". = 'TQPainter &amp;'">
+    TQPainter arg<xsl:value-of select="$idx" />; // TODO (hack for qcanvas)
         </xsl:when>
-        <xsl:when test=". = 'const QPainter &amp;'">
-    QPainter arg<xsl:value-of select="$idx" />; // TODO (hack for qcanvas)
+        <xsl:when test=". = 'const TQPainter &amp;'">
+    TQPainter arg<xsl:value-of select="$idx" />; // TODO (hack for qcanvas)
         </xsl:when>
-        <xsl:when test=". = 'const QWMatrix &amp;'">
-    QWMatrix arg<xsl:value-of select="$idx" />; // TODO (hack for qcanvasview)
+        <xsl:when test=". = 'const TQWMatrix &amp;'">
+    TQWMatrix arg<xsl:value-of select="$idx" />; // TODO (hack for qcanvasview)
         </xsl:when>
 
         <xsl:otherwise>
@@ -497,8 +497,8 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object
       return KJS::Number( ret );
       </xsl:when>
 
-      <xsl:when test="$rettype = 'QString'">
-      QString ret;
+      <xsl:when test="$rettype = 'TQString'">
+      TQString ret;
       ret = instance-><xsl:value-of select="name" />( <xsl:for-each select="param">
        arg<xsl:value-of select="position()-1" /><xsl:if test="position() != count(../param)">,</xsl:if></xsl:for-each> );
       return KJS::String( ret );
@@ -513,18 +513,18 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object
 
       <!-- Value returns -->
 
-      <xsl:when test="($rettype = 'QRect') or ($rettype = 'QSize') or ($rettype = 'QPoint')
-                      or ($rettype = 'QPixmap') or ($rettype = 'QImage') or ($rettype = 'QBrush')
-                      or ($rettype = 'QPen') or ($rettype = 'QDate') or ($rettype = 'QDateTime')
-                      or ($rettype = 'QTime')">
+      <xsl:when test="($rettype = 'TQRect') or ($rettype = 'TQSize') or ($rettype = 'TQPoint')
+                      or ($rettype = 'TQPixmap') or ($rettype = 'TQImage') or ($rettype = 'TQBrush')
+                      or ($rettype = 'TQPen') or ($rettype = 'TQDate') or ($rettype = 'TQDateTime')
+                      or ($rettype = 'TQTime')">
       <xsl:value-of select="$rettype"/> ret;
       ret = instance-><xsl:value-of select="name" />( <xsl:for-each select="param">
        arg<xsl:value-of select="position()-1" /><xsl:if test="position() != count(../param)">,</xsl:if></xsl:for-each> );
 
        return convertToValue( exec, ret );
       </xsl:when>
-      <xsl:when test="$rettype = 'QStringList'">
-      QStringList ret;
+      <xsl:when test="$rettype = 'TQStringList'">
+      TQStringList ret;
       ret = instance-><xsl:value-of select="name" />( <xsl:for-each select="param">
        arg<xsl:value-of select="position()-1" /><xsl:if test="position() != count(../param)">,</xsl:if></xsl:for-each> );
 
diff --git a/kjsembed/builtins/qdir_imp.cpp b/kjsembed/builtins/qdir_imp.cpp
index 55895a59..4a1d6bde 100644
--- a/kjsembed/builtins/qdir_imp.cpp
+++ b/kjsembed/builtins/qdir_imp.cpp
@@ -22,14 +22,14 @@
  */
 namespace KJSEmbed {
 namespace Bindings {
-    KJS::Object QDirLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const
+    KJS::Object TQDirLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const
     {
         JSOpaqueProxy * prx;
         if ( args.size() == 0 ) {
-            prx = new JSOpaqueProxy( new TQDir( TQDir::current() ), "TQDir" );
+            prx = new JSOpaqueProxy( new TTQDir( TTQDir::current() ), "TTQDir" );
         } else {
-            TQString arg0 = ( args.size() >= 1 ) ? args[ 0 ].toString( exec ).qstring() : TQString::null;
-            prx = new JSOpaqueProxy( new TQDir( arg0 ), "TQDir" );
+            TTQString arg0 = ( args.size() >= 1 ) ? args[ 0 ].toString( exec ).qstring() : TTQString::null;
+            prx = new JSOpaqueProxy( new TTQDir( arg0 ), "TTQDir" );
         }
         prx->setOwner( JSProxy::JavaScript );
         KJS::Object proxyObj( prx );
@@ -37,23 +37,23 @@ namespace Bindings {
         return proxyObj;
     }
 
-    void QDirLoader::addBindings( KJSEmbedPart *jspart, KJS::ExecState *exec, KJS::Object &proxy ) const
+    void TQDirLoader::addBindings( KJSEmbedPart *jspart, KJS::ExecState *exec, KJS::Object &proxy ) const
     {
-        QDirImp::addBindings( exec, proxy );
+        TQDirImp::addBindings( exec, proxy );
     }
 
 }
 
-QDirImp::QDirImp( KJS::ExecState *exec, int id )
+TTQDirImp::TQDirImp( KJS::ExecState *exec, int id )
    : JSProxyImp(exec), mid(id)
 {
 }
 
-QDirImp::~QDirImp()
+TTQDirImp::~TQDirImp()
 {
 }
 
-void QDirImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQDirImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -160,7 +160,7 @@ void QDirImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 
     int idx = 0;
     do {
-        QDirImp *meth = new QDirImp( exec, methods[idx].id );
+        TQDirImp *meth = new TQDirImp( exec, methods[idx].id );
         object.put( exec , methods[idx].name, KJS::Object(meth) );
         ++idx;
     } while( methods[idx].id );
@@ -177,31 +177,31 @@ void QDirImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     EnumValue enums[] = {
 
         // enum FilterSpec
-        { "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 },
+        { "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 },
         // enum SortSpec
-        { "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 },
+        { "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 },
 	{ 0, 0 }
     };
 
@@ -214,20 +214,20 @@ void QDirImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 
-KJS::Value QDirImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQDirImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op ) {
-        kdWarning() << "QDirImp::call() failed, not a JSOpaqueProxy" << endl;
+        kdWarning() << "TQDirImp::call() failed, not a JSOpaqueProxy" << endl;
         return KJS::Value();
     }
 
-    if ( op->typeName() != "TQDir" ) {
-        kdWarning() << "QDirImp::call() failed, type is " << op->typeName() << endl;
+    if ( op->typeName() != "TTQDir" ) {
+        kdWarning() << "TQDirImp::call() failed, type is " << op->typeName() << endl;
 	return KJS::Value();
     }
 
-    instance =  op->toNative<TQDir>();
+    instance =  op->toNative<TTQDir>();
 
     switch( mid ) {
 
@@ -431,15 +431,15 @@ KJS::Value QDirImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li
         break;
     }
 
-    TQString msg = i18n( "QDirImp has no method with id '%1'." ).arg( mid );
+    TTQString msg = i18n( "TQDirImp has no method with id '%1'." ).arg( mid );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QDirImp::setPath_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::setPath_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
       instance->setPath(
        arg0 );
@@ -447,50 +447,50 @@ KJS::Value QDirImp::setPath_7( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QDirImp::path_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::path_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->path(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QDirImp::absPath_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::absPath_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->absPath(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QDirImp::canonicalPath_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::canonicalPath_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->canonicalPath(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QDirImp::dirName_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::dirName_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->dirName(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QDirImp::filePath_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::filePath_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
-      TQString ret;
+      TTQString ret;
       ret = instance->filePath(
        arg0,
        arg1 );
@@ -498,14 +498,14 @@ KJS::Value QDirImp::filePath_12( KJS::ExecState *exec, KJS::Object &obj, const K
 
 }
 
-KJS::Value QDirImp::absFilePath_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::absFilePath_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
-      TQString ret;
+      TTQString ret;
       ret = instance->absFilePath(
        arg0,
        arg1 );
@@ -513,10 +513,10 @@ KJS::Value QDirImp::absFilePath_13( KJS::ExecState *exec, KJS::Object &obj, cons
 
 }
 
-KJS::Value QDirImp::cd_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::cd_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
@@ -528,7 +528,7 @@ KJS::Value QDirImp::cd_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::Li
 
 }
 
-KJS::Value QDirImp::cdUp_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::cdUp_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -537,19 +537,19 @@ KJS::Value QDirImp::cdUp_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::
 
 }
 
-KJS::Value QDirImp::nameFilter_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::nameFilter_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->nameFilter(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QDirImp::setNameFilter_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::setNameFilter_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
       instance->setNameFilter(
        arg0 );
@@ -557,7 +557,7 @@ KJS::Value QDirImp::setNameFilter_17( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QDirImp::filter_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::filter_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->filter(  );
@@ -565,7 +565,7 @@ KJS::Value QDirImp::filter_18( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QDirImp::setFilter_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::setFilter_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -576,7 +576,7 @@ KJS::Value QDirImp::setFilter_19( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QDirImp::sorting_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::sorting_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->sorting(  );
@@ -584,7 +584,7 @@ KJS::Value QDirImp::sorting_20( KJS::ExecState *exec, KJS::Object &obj, const KJ
 
 }
 
-KJS::Value QDirImp::setSorting_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::setSorting_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -595,7 +595,7 @@ KJS::Value QDirImp::setSorting_21( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QDirImp::matchAllDirs_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::matchAllDirs_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -604,7 +604,7 @@ KJS::Value QDirImp::matchAllDirs_22( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QDirImp::setMatchAllDirs_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::setMatchAllDirs_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = (args.size() >= 1) ? args[0].toBoolean(exec) : false;
@@ -615,7 +615,7 @@ KJS::Value QDirImp::setMatchAllDirs_23( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QDirImp::count_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::count_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       uint ret;
@@ -624,7 +624,7 @@ KJS::Value QDirImp::count_24( KJS::ExecState *exec, KJS::Object &obj, const KJS:
 
 }
 
-KJS::Value QDirImp::encodedEntryList_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::encodedEntryList_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -634,14 +634,14 @@ KJS::Value QDirImp::encodedEntryList_26( KJS::ExecState *exec, KJS::Object &obj,
       instance->encodedEntryList(
        arg0,
        arg1 );
-      return KJS::Value(); // Returns 'QStrList'
+      return KJS::Value(); // Returns 'TQStrList'
 
 }
 
-KJS::Value QDirImp::encodedEntryList_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::encodedEntryList_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1;
 
@@ -651,18 +651,18 @@ KJS::Value QDirImp::encodedEntryList_27( KJS::ExecState *exec, KJS::Object &obj,
        arg0,
        arg1,
        arg2 );
-      return KJS::Value(); // Returns 'QStrList'
+      return KJS::Value(); // Returns 'TQStrList'
 
 }
 
-KJS::Value QDirImp::entryList_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::entryList_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
 
     int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1;
 
-      TQStringList ret;
+      TTQStringList ret;
       ret = instance->entryList(
        arg0,
        arg1 );
@@ -671,16 +671,16 @@ KJS::Value QDirImp::entryList_28( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QDirImp::entryList_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::entryList_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1;
 
     int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1;
 
-      TQStringList ret;
+      TTQStringList ret;
       ret = instance->entryList(
        arg0,
        arg1,
@@ -690,7 +690,7 @@ KJS::Value QDirImp::entryList_29( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QDirImp::entryInfoList_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::entryInfoList_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -700,14 +700,14 @@ KJS::Value QDirImp::entryInfoList_30( KJS::ExecState *exec, KJS::Object &obj, co
       instance->entryInfoList(
        arg0,
        arg1 );
-      return KJS::Value(); // Returns 'const QFileInfoList *'
+      return KJS::Value(); // Returns 'const TQFileInfoList *'
 
 }
 
-KJS::Value QDirImp::entryInfoList_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::entryInfoList_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1;
 
@@ -717,14 +717,14 @@ KJS::Value QDirImp::entryInfoList_31( KJS::ExecState *exec, KJS::Object &obj, co
        arg0,
        arg1,
        arg2 );
-      return KJS::Value(); // Returns 'const QFileInfoList *'
+      return KJS::Value(); // Returns 'const TQFileInfoList *'
 
 }
 
-KJS::Value QDirImp::mkdir_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::mkdir_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
@@ -736,10 +736,10 @@ KJS::Value QDirImp::mkdir_32( KJS::ExecState *exec, KJS::Object &obj, const KJS:
 
 }
 
-KJS::Value QDirImp::rmdir_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::rmdir_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
@@ -751,7 +751,7 @@ KJS::Value QDirImp::rmdir_33( KJS::ExecState *exec, KJS::Object &obj, const KJS:
 
 }
 
-KJS::Value QDirImp::isReadable_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::isReadable_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -760,7 +760,7 @@ KJS::Value QDirImp::isReadable_34( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QDirImp::exists_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::exists_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -769,7 +769,7 @@ KJS::Value QDirImp::exists_35( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QDirImp::isRoot_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::isRoot_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -778,7 +778,7 @@ KJS::Value QDirImp::isRoot_36( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QDirImp::isRelative_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::isRelative_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -787,7 +787,7 @@ KJS::Value QDirImp::isRelative_37( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QDirImp::convertToAbs_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::convertToAbs_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->convertToAbs(  );
@@ -795,10 +795,10 @@ KJS::Value QDirImp::convertToAbs_38( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QDirImp::remove_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::remove_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
@@ -810,12 +810,12 @@ KJS::Value QDirImp::remove_41( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QDirImp::rename_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::rename_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
-    TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null;
+    TTQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TTQString::null;
 
     bool arg2 = (args.size() >= 3) ? args[2].toBoolean(exec) : false;
 
@@ -828,10 +828,10 @@ KJS::Value QDirImp::rename_42( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QDirImp::exists_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::exists_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
@@ -843,7 +843,7 @@ KJS::Value QDirImp::exists_43( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QDirImp::refresh_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::refresh_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->refresh(  );
@@ -851,27 +851,27 @@ KJS::Value QDirImp::refresh_44( KJS::ExecState *exec, KJS::Object &obj, const KJ
 
 }
 
-KJS::Value QDirImp::convertSeparators_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::convertSeparators_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
-      TQString ret;
+      TTQString ret;
       ret = instance->convertSeparators(
        arg0 );
       return KJS::String( ret );
 
 }
 
-KJS::Value QDirImp::drives_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::drives_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->drives(  );
-      return KJS::Value(); // Returns 'const QFileInfoList *'
+      return KJS::Value(); // Returns 'const TQFileInfoList *'
 
 }
 
-KJS::Value QDirImp::separator_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::separator_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->separator(  );
@@ -879,10 +879,10 @@ KJS::Value QDirImp::separator_47( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QDirImp::setCurrent_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::setCurrent_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
       bool ret;
       ret = instance->setCurrent(
@@ -891,66 +891,66 @@ KJS::Value QDirImp::setCurrent_48( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QDirImp::current_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::current_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->current(  );
-      return KJS::Value(); // Returns 'QDir'
+      return KJS::Value(); // Returns 'TQDir'
 
 }
 
-KJS::Value QDirImp::home_50( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::home_50( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->home(  );
-      return KJS::Value(); // Returns 'QDir'
+      return KJS::Value(); // Returns 'TQDir'
 
 }
 
-KJS::Value QDirImp::root_51( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::root_51( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->root(  );
-      return KJS::Value(); // Returns 'QDir'
+      return KJS::Value(); // Returns 'TQDir'
 
 }
 
-KJS::Value QDirImp::currentDirPath_52( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::currentDirPath_52( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->currentDirPath(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QDirImp::homeDirPath_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::homeDirPath_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->homeDirPath(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QDirImp::rootDirPath_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::rootDirPath_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->rootDirPath(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QDirImp::match_55( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::match_55( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQStringList arg0;
+    TTQStringList arg0;
     if ( args.size() >= 1 ) {
       // TODO: populate the list
     }
 
-    TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null;
+    TTQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TTQString::null;
 
       bool ret;
       ret = instance->match(
@@ -960,12 +960,12 @@ KJS::Value QDirImp::match_55( KJS::ExecState *exec, KJS::Object &obj, const KJS:
 
 }
 
-KJS::Value QDirImp::match_56( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::match_56( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
-    TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null;
+    TTQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TTQString::null;
 
       bool ret;
       ret = instance->match(
@@ -975,22 +975,22 @@ KJS::Value QDirImp::match_56( KJS::ExecState *exec, KJS::Object &obj, const KJS:
 
 }
 
-KJS::Value QDirImp::cleanDirPath_57( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::cleanDirPath_57( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
-      TQString ret;
+      TTQString ret;
       ret = instance->cleanDirPath(
        arg0 );
       return KJS::String( ret );
 
 }
 
-KJS::Value QDirImp::isRelativePath_58( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQDirImp::isRelativePath_58( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
       bool ret;
       ret = instance->isRelativePath(
diff --git a/kjsembed/builtins/qdir_imp.h b/kjsembed/builtins/qdir_imp.h
index 9bd6d770..ed89ad7c 100644
--- a/kjsembed/builtins/qdir_imp.h
+++ b/kjsembed/builtins/qdir_imp.h
@@ -10,14 +10,14 @@
 #include <kjsembed/jsobjectproxy_imp.h>
 #include <kjsembed/jsbindingbase.h>
 
-class TQDir;
+class TTQDir;
 
 /**
  * Namespace containing the KJSEmbed library.
  */
 namespace KJSEmbed {
 namespace Bindings {
-    class QDirLoader : public JSBindingBase
+    class TQDirLoader : public JSBindingBase
     {
         public:
             KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const;
@@ -25,11 +25,11 @@ namespace Bindings {
     };
 }
 /**
- * Wrapper class for TQDir methods.
+ * Wrapper class for TTQDir methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QDirImp : public JSProxyImp
+class TQDirImp : public JSProxyImp
 {
 public:
    /** Enumerates the methods supported by this class. */
@@ -87,8 +87,8 @@ public:
        Method_Last = -1
    };
 
-   QDirImp( KJS::ExecState *exec, int id );
-   ~QDirImp();
+   TQDirImp( KJS::ExecState *exec, int id );
+   ~TQDirImp();
 
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
@@ -157,7 +157,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQDir *instance; // Temp
+   TTQDir *instance; // Temp
    int mid;
 };
 
diff --git a/kjsembed/builtins/qfile_imp.cpp b/kjsembed/builtins/qfile_imp.cpp
index abc38d09..85d2fc6b 100644
--- a/kjsembed/builtins/qfile_imp.cpp
+++ b/kjsembed/builtins/qfile_imp.cpp
@@ -25,16 +25,16 @@
  */
 namespace KJSEmbed {
 
-QFileImp::QFileImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQFileImp::TQFileImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QFileImp::~QFileImp()
+TTQFileImp::~TQFileImp()
 {
 }
 
-void QFileImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQFileImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -71,11 +71,11 @@ void QFileImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     do {
         if ( lastName != methods[idx].name ) {
-            QFileImp *meth = new QFileImp( exec, methods[idx].id );
+            TQFileImp *meth = new TQFileImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -85,64 +85,64 @@ void QFileImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 
 }
 
-TQFile *QFileImp::toQFile( KJS::Object &self )
+TTQFile *TQFileImp::toTQFile( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQFile *>( obj );
+           return dynamic_cast<TTQFile *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQFile" )
+    if ( op->typeName() != "TTQFile" )
         return 0;
 
-    return  op->toNative<TQFile>();
+    return  op->toNative<TTQFile>();
 }
 
 
-KJS::Object QFileImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQFileImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QFile_1:
-             return QFile_1( exec, args );
+             return TQFile_1( exec, args );
              break;
 
          case Constructor_QFile_2:
-             return QFile_2( exec, args );
+             return TQFile_2( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QFileCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQFileCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QFileImp::QFile_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQFileImp::TQFile_1( KJS::ExecState *exec, const KJS::List &args )
 {
 	return KJS::Object();
 }
 
-KJS::Object QFileImp::QFile_2( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQFileImp::TQFile_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
     // TODO
-    TQWidget *arg0 = 0L;
+    TTQWidget *arg0 = 0L;
     return KJS::Object();
 
 }
 
-KJS::Value QFileImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQFileImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QFileImp::toQFile( self );
+    instance = TQFileImp::toTQFile( self );
 
     switch( id ) {
 
@@ -266,24 +266,24 @@ KJS::Value QFileImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L
         break;
     }
 
-    TQString msg = i18n( "QFileImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQFileImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg, KJS::ReferenceError );
 }
 
 
-KJS::Value QFileImp::name_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::name_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->name(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QFileImp::setName_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::setName_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
       instance->setName(
        arg0 );
@@ -291,7 +291,7 @@ KJS::Value QFileImp::setName_5( KJS::ExecState *exec, KJS::Object &obj, const KJ
 
 }
 
-KJS::Value QFileImp::exists_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::exists_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -300,7 +300,7 @@ KJS::Value QFileImp::exists_6( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QFileImp::remove_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::remove_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -309,7 +309,7 @@ KJS::Value QFileImp::remove_7( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QFileImp::open_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::open_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -321,7 +321,7 @@ KJS::Value QFileImp::open_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::
 
 }
 
-KJS::Value QFileImp::open_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::open_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -339,7 +339,7 @@ KJS::Value QFileImp::open_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::
 
 }
 
-KJS::Value QFileImp::open_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::open_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -354,7 +354,7 @@ KJS::Value QFileImp::open_10( KJS::ExecState *exec, KJS::Object &obj, const KJS:
 
 }
 
-KJS::Value QFileImp::close_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::close_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->close(  );
@@ -362,7 +362,7 @@ KJS::Value QFileImp::close_11( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QFileImp::flush_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::flush_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->flush(  );
@@ -370,7 +370,7 @@ KJS::Value QFileImp::flush_12( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QFileImp::size_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::size_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->size(  );
@@ -378,7 +378,7 @@ KJS::Value QFileImp::size_13( KJS::ExecState *exec, KJS::Object &obj, const KJS:
 
 }
 
-KJS::Value QFileImp::at_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::at_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->at(  );
@@ -386,10 +386,10 @@ KJS::Value QFileImp::at_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::L
 
 }
 
-KJS::Value QFileImp::at_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::at_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQFile::Offset arg0 = 0; // TODO (hack for qfile)
+    TTQFile::Offset arg0 = 0; // TODO (hack for qfile)
 
       bool ret;
       ret = instance->at(
@@ -398,7 +398,7 @@ KJS::Value QFileImp::at_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::L
 
 }
 
-KJS::Value QFileImp::atEnd_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::atEnd_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -407,7 +407,7 @@ KJS::Value QFileImp::atEnd_16( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QFileImp::readBlock_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::readBlock_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     // Unsupported parameter char *
@@ -427,7 +427,7 @@ KJS::Value QFileImp::readBlock_17( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QFileImp::writeBlock_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::writeBlock_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     const char *arg0 = (args.size() >= 1) ? args[0].toString(exec).ascii() : 0;
@@ -444,10 +444,10 @@ KJS::Value QFileImp::writeBlock_18( KJS::ExecState *exec, KJS::Object &obj, cons
 
 }
 
-KJS::Value QFileImp::writeBlock_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::writeBlock_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQByteArray arg0; // TODO (hack for qfile)
+    TTQByteArray arg0; // TODO (hack for qfile)
 
       instance->writeBlock(
        arg0 );
@@ -455,7 +455,7 @@ KJS::Value QFileImp::writeBlock_19( KJS::ExecState *exec, KJS::Object &obj, cons
 
 }
 
-KJS::Value QFileImp::readLine_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::readLine_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     // Unsupported parameter char *
@@ -475,10 +475,10 @@ KJS::Value QFileImp::readLine_20( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QFileImp::readLine_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::readLine_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     // Unsupported parameter Q_ULONG
     return KJS::Value();
@@ -492,7 +492,7 @@ KJS::Value QFileImp::readLine_21( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QFileImp::getch_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::getch_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -501,7 +501,7 @@ KJS::Value QFileImp::getch_22( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QFileImp::putch_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::putch_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -513,7 +513,7 @@ KJS::Value QFileImp::putch_23( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QFileImp::ungetch_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::ungetch_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -525,7 +525,7 @@ KJS::Value QFileImp::ungetch_24( KJS::ExecState *exec, KJS::Object &obj, const K
 
 }
 
-KJS::Value QFileImp::handle_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::handle_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -534,42 +534,42 @@ KJS::Value QFileImp::handle_25( KJS::ExecState *exec, KJS::Object &obj, const KJ
 
 }
 
-KJS::Value QFileImp::errorString_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::errorString_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->errorString(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QFileImp::encodeName_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::encodeName_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
       instance->encodeName(
        arg0 );
-      return KJS::Value(); // Returns 'QCString'
+      return KJS::Value(); // Returns 'TQCString'
 
 }
 
-KJS::Value QFileImp::decodeName_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::decodeName_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    const TQCString arg0 = (args.size() >= 1) ? args[0].toString(exec).ascii() : 0;
+    const TTQCString arg0 = (args.size() >= 1) ? args[0].toString(exec).ascii() : 0;
 
-      TQString ret;
+      TTQString ret;
       ret = instance->decodeName(
        arg0 );
       return KJS::String( ret );
 
 }
 
-KJS::Value QFileImp::setEncodingFunction_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::setEncodingFunction_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQFile::EncoderFn arg0 = 0; // TODO (hack for qfile)
+    TTQFile::EncoderFn arg0 = 0; // TODO (hack for qfile)
 
       instance->setEncodingFunction(
        arg0 );
@@ -577,10 +577,10 @@ KJS::Value QFileImp::setEncodingFunction_29( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QFileImp::setDecodingFunction_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::setDecodingFunction_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQFile::DecoderFn arg0 = 0; // TODO (hack for qfile)
+    TTQFile::DecoderFn arg0 = 0; // TODO (hack for qfile)
 
       instance->setDecodingFunction(
        arg0 );
@@ -588,10 +588,10 @@ KJS::Value QFileImp::setDecodingFunction_30( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QFileImp::exists_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::exists_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
       bool ret;
       ret = instance->exists(
@@ -600,10 +600,10 @@ KJS::Value QFileImp::exists_31( KJS::ExecState *exec, KJS::Object &obj, const KJ
 
 }
 
-KJS::Value QFileImp::remove_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQFileImp::remove_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
       bool ret;
       ret = instance->remove(
diff --git a/kjsembed/builtins/qfile_imp.h b/kjsembed/builtins/qfile_imp.h
index bf4df5ea..6db9b2df 100644
--- a/kjsembed/builtins/qfile_imp.h
+++ b/kjsembed/builtins/qfile_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQFile;
+class TTQFile;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQFile;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQFile methods.
+ * Wrapper class for TTQFile methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QFileImp : public JSProxyImp
+class TQFileImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -67,19 +67,19 @@ public:
        Method_Last = -1
    };
 
-   QFileImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QFileImp();
+   TQFileImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQFileImp();
 
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQFile *toQFile( KJS::Object &object );
+   static TTQFile *toTQFile( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QFile_1( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QFile_2( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQFile_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQFile_2( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -132,7 +132,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQFile *instance; // Temp
+   TTQFile *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/builtins/resources.cpp b/kjsembed/builtins/resources.cpp
index 84128f69..40ffdcd2 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 )
 {
-//    TQString arg0 = extractQString(exec, args, 0);
-//    TQString arg1 = extractQString(exec, args, 1);
+//    TTQString arg0 = extractTQString(exec, args, 0);
+//    TTQString arg1 = extractTQString(exec, args, 1);
 
     switch( id ) {
 	case StdDirsImp::findResource:
 	{
-	    TQString arg0 = extractQString(exec, args, 0);
-	    TQString arg1 = extractQString(exec, args, 1);
-	    TQString path = KGlobal::dirs ()->findResource(arg0.latin1(), arg1);
+	    TTQString arg0 = extractTQString(exec, args, 0);
+	    TTQString arg1 = extractTQString(exec, args, 1);
+	    TTQString path = KGlobal::dirs ()->findResource(arg0.latin1(), arg1);
 	    return KJS::String( path );
 	}
 	case StdDirsImp::addResourceType:
 	{
-	    TQString arg0 = extractQString(exec, args, 0);
-	    TQString arg1 = extractQString(exec, args, 1);
+	    TTQString arg0 = extractTQString(exec, args, 0);
+	    TTQString arg1 = extractTQString(exec, args, 1);
 	    bool isOk = KGlobal::dirs ()->addResourceType(arg0.latin1(), arg1);
 	    return KJS::Boolean( isOk );
 	}
 	case StdDirsImp::kde_default:
 	{
-	    TQString arg0 = extractQString(exec, args, 0);
-	    TQString path = KGlobal::dirs ()->kde_default(arg0.latin1());
+	    TTQString arg0 = extractTQString(exec, args, 0);
+	    TTQString path = KGlobal::dirs ()->kde_default(arg0.latin1());
 	    return KJS::String( path );
 	}
 	case StdDirsImp::addResourceDir:
 	{
-	    TQString arg0 = extractQString(exec, args, 0);
-	    TQString arg1 = extractQString(exec, args, 1);
+	    TTQString arg0 = extractTQString(exec, args, 0);
+	    TTQString arg1 = extractTQString(exec, args, 1);
 	    bool isOk = KGlobal::dirs ()->addResourceDir(arg0.latin1(), arg1);
 	    return KJS::Boolean( isOk );
 	}
 	case StdDirsImp::findResourceDir:
 	{
-	    TQString arg0 = extractQString(exec, args, 0);
-	    TQString arg1 = extractQString(exec, args, 1);
-	    TQString path = KGlobal::dirs ()->findResourceDir(arg0.latin1(), arg1);
+	    TTQString arg0 = extractTQString(exec, args, 0);
+	    TTQString arg1 = extractTQString(exec, args, 1);
+	    TTQString path = KGlobal::dirs ()->findResourceDir(arg0.latin1(), arg1);
 	    return KJS::String( path );
 	}
 	case StdDirsImp::saveLocation:
 	{
-	    TQString arg0 = extractQString(exec, args, 0);
-	    TQString arg1 = extractQString(exec, args, 1);
+	    TTQString arg0 = extractTQString(exec, args, 0);
+	    TTQString arg1 = extractTQString(exec, args, 1);
 	    bool arg2 = (args.size() > 2) ? args[2].toBoolean(exec) : true;
-	    TQString path = KGlobal::dirs ()->saveLocation(arg0.latin1(), arg1, arg2);
+	    TTQString path = KGlobal::dirs ()->saveLocation(arg0.latin1(), arg1, arg2);
 	    return KJS::String( path );
 	}
 	case StdDirsImp::makeDir:
 	{
-	    TQString arg0 = extractQString(exec, args, 0);
+	    TTQString 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:
 	{
-	    TQString arg0 = extractQString(exec, args, 0);
+	    TTQString arg0 = extractTQString(exec, args, 0);
 	    bool isOk = KStandardDirs::exists(arg0);
 	    return KJS::Boolean( isOk );
 	}
 	case StdDirsImp::realPath:
 	{
-	    TQString arg0 = extractQString(exec, args, 0);
-	    TQString path = KStandardDirs::realPath(arg0);
+	    TTQString arg0 = extractTQString(exec, args, 0);
+	    TTQString path = KStandardDirs::realPath(arg0);
 	    return KJS::String( path );
 	}
 	case StdDirsImp::currentDirPath:
-		return KJS::String(TQDir::currentDirPath());
+		return KJS::String(TTQDir::currentDirPath());
 	case StdDirsImp::homeDirPath:
-		return KJS::String(TQDir::homeDirPath());
+		return KJS::String(TTQDir::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 TQPixmap &icon)
+KJS::Value StdIconsImp::wrapPixmap(KJS::ExecState *exec, const TTQPixmap &icon)
 {
 	return convertToValue(exec, icon);
 }
 
 KJS::Value StdIconsImp::call( KJS::ExecState *exec, KJS::Object &/*obj*/, const KJS::List &args )
 {
-    TQString arg0 = extractQString(exec, args, 0);  // Name
+    TTQString 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, TQPixmap::fromMimeSource(arg0));
+	    return wrapPixmap( exec, TTQPixmap::fromMimeSource(arg0));
 	}
 	default:
 	    kdWarning() << "StdDirsImp has no method " << id << endl;
diff --git a/kjsembed/builtins/resources.h b/kjsembed/builtins/resources.h
index cfd589ce..45d7dad7 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 TQPixmap **/
-    KJS::Value wrapPixmap(KJS::ExecState *exec,const TQPixmap &icon);
+	/** wrap a TTQPixmap **/
+    KJS::Value wrapPixmap(KJS::ExecState *exec,const TTQPixmap &icon);
     uint id;
     JSFactory *jsfact;
 };
diff --git a/kjsembed/builtins/saxhandler.cpp b/kjsembed/builtins/saxhandler.cpp
index ff0334bf..50507ff9 100644
--- a/kjsembed/builtins/saxhandler.cpp
+++ b/kjsembed/builtins/saxhandler.cpp
@@ -23,7 +23,7 @@ namespace KJSEmbed {
 namespace BuiltIns {
 
 SaxHandler::SaxHandler( KJS::ExecState *execstate )
-    : TQXmlDefaultHandler(), exec(execstate), error( ErrorNone )
+    : TTQXmlDefaultHandler(), exec(execstate), error( ErrorNone )
 {
 }
 
@@ -45,7 +45,7 @@ bool SaxHandler::startDocument()
 
     KJS::Identifier funName("startDocument");
     if ( !jshandler.hasProperty(exec, funName) )
-	return TQXmlDefaultHandler::startDocument();
+	return TTQXmlDefaultHandler::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 TQXmlDefaultHandler::endDocument();
+	return TTQXmlDefaultHandler::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 TQString &ns, const TQString &ln, const TQString &qn,
-			       const TQXmlAttributes &attrs )
+bool SaxHandler::startElement( const TTQString &ns, const TTQString &ln, const TTQString &qn,
+			       const TTQXmlAttributes &attrs )
 {
     if ( !jshandler.isValid() ) {
 	error = ErrorNoHandler;
@@ -88,7 +88,7 @@ bool SaxHandler::startElement( const TQString &ns, const TQString &ln, const TQS
 
     KJS::Identifier funName("startElement");
     if ( !jshandler.hasProperty(exec, funName) )
-	return TQXmlDefaultHandler::startElement( ns, ln, qn, attrs );
+	return TTQXmlDefaultHandler::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 TQString &ns, const TQString &ln, const TQS
     return ret.toBoolean( exec );
 }
 
-bool SaxHandler::endElement( const TQString &ns, const TQString &ln, const TQString &qn )
+bool SaxHandler::endElement( const TTQString &ns, const TTQString &ln, const TTQString &qn )
 {
     if ( !jshandler.isValid() ) {
 	error = ErrorNoHandler;
@@ -115,7 +115,7 @@ bool SaxHandler::endElement( const TQString &ns, const TQString &ln, const TQStr
 
     KJS::Identifier funName("endElement");
     if ( !jshandler.hasProperty(exec, funName) )
-	return TQXmlDefaultHandler::endElement( ns, ln, qn );
+	return TTQXmlDefaultHandler::endElement( ns, ln, qn );
 
     KJS::Object fun = jshandler.get(exec, funName).toObject( exec );
     if ( !fun.implementsCall() ) {
@@ -132,7 +132,7 @@ bool SaxHandler::endElement( const TQString &ns, const TQString &ln, const TQStr
     return ret.toBoolean( exec );
 }
 
-bool SaxHandler::characters( const TQString &chars )
+bool SaxHandler::characters( const TTQString &chars )
 {
     if ( !jshandler.isValid() ) {
 	error = ErrorNoHandler;
@@ -141,7 +141,7 @@ bool SaxHandler::characters( const TQString &chars )
 
     KJS::Identifier funName("characters");
     if ( !jshandler.hasProperty(exec, funName) )
-	return TQXmlDefaultHandler::characters( chars );
+	return TTQXmlDefaultHandler::characters( chars );
 
     KJS::Object fun = jshandler.get(exec, funName).toObject( exec );
     if ( !fun.implementsCall() ) {
@@ -156,15 +156,15 @@ bool SaxHandler::characters( const TQString &chars )
     return ret.toBoolean( exec );
 }
 
-TQString SaxHandler::errorString()
+TTQString SaxHandler::errorString()
 {
     switch( error ) {
 
 	case ErrorNoHandler:
-	    return TQString("No handler specified");
+	    return TTQString("No handler specified");
 	    break;
 	case ErrorNotCallable:
-	    return TQString("One of the callbacks of the handler is not callable");
+	    return TTQString("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 @@ TQString SaxHandler::errorString()
 	    break;
     }
 
-    return TQXmlDefaultHandler::errorString();
+    return TTQXmlDefaultHandler::errorString();
 }
 
 } // namespace KJSEmbed::BuiltIns
diff --git a/kjsembed/builtins/saxhandler.h b/kjsembed/builtins/saxhandler.h
index fbf3e512..4a1b1954 100644
--- a/kjsembed/builtins/saxhandler.h
+++ b/kjsembed/builtins/saxhandler.h
@@ -33,7 +33,7 @@ namespace BuiltIns {
  *
  * @author Richard Moore, rich@kde.org
  */
-class SaxHandler : public QXmlDefaultHandler
+class SaxHandler : public TQXmlDefaultHandler
 {
 public:
     /** Defines the errors that are specific to the KJS SAX support. */
@@ -57,12 +57,12 @@ public:
     virtual bool startDocument();
     virtual bool endDocument();
 
-    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 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 TQString errorString();
+    virtual TTQString errorString();
 
 private:
     KJS::ExecState *exec;
diff --git a/kjsembed/builtins/stdaction_imp.cpp b/kjsembed/builtins/stdaction_imp.cpp
index cad81bfe..d81ead33 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?
-    TQObject *recv = extractQObject( exec, args, 0);
+    TTQObject *recv = extractTQObject( exec, args, 0);
 
-    TQString sl = extractQString( exec, args, 1 );
+    TTQString sl = extractTQString( exec, args, 1 );
     const char *slc = sl.isNull() ? "" : sl.ascii();
 
-    TQObject *parentobj = extractQObject( exec, args, 2 );
+    TTQObject *parentobj = extractTQObject( exec, args, 2 );
     KActionCollection *parent = parentobj ? dynamic_cast<KActionCollection *>( parentobj ) : 0;
 
     KStdAction::StdAction actid = static_cast<KStdAction::StdAction>(id);
diff --git a/kjsembed/builtins/stddialog_imp.cpp b/kjsembed/builtins/stddialog_imp.cpp
index 48bb468d..122cd300 100644
--- a/kjsembed/builtins/stddialog_imp.cpp
+++ b/kjsembed/builtins/stddialog_imp.cpp
@@ -26,7 +26,7 @@
 #else
 
 #include <tqfiledialog.h>
-#define KFileDialog QFileDialog
+#define KFileDialog TQFileDialog
 
 #endif // QT_ONLY
 
@@ -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 )
 {
-    TQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TQString::null;
-    TQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TTQString::null;
+    TTQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TTQString::null;
 
     switch( id ) {
 	case MethodGetOpenFileName:
 	{
-	    TQString s = KFileDialog::getOpenFileName( arg0, arg1 );
+	    TTQString s = KFileDialog::getOpenFileName( arg0, arg1 );
 	    return KJS::String( s );
 	}
 	case MethodGetSaveFileName:
 	{
-	    TQString s = KFileDialog::getSaveFileName( arg0, arg1 );
+	    TTQString s = KFileDialog::getSaveFileName( arg0, arg1 );
 	    return KJS::String( s );
 	}
 	case MethodGetExistingDirectory:
 	{
-	    TQString s = KFileDialog::getExistingDirectory( arg0 );
+	    TTQString s = KFileDialog::getExistingDirectory( arg0 );
 	    return KJS::String( s );
 	}
 #ifndef QT_ONLY
         case MethodGetColor:
 	{
-	    TQColor col;
+	    TTQColor col;
 	    int res = KColorDialog::getColor( col );
-	    if ( res == TQDialog::Accepted )
-		return convertToValue( exec, TQVariant(col) );
+	    if ( res == TTQDialog::Accepted )
+		return convertToValue( exec, TTQVariant(col) );
 	}
 	case MethodGetOpenURL:
 	{
diff --git a/kjsembed/builtins/textstream_imp.cpp b/kjsembed/builtins/textstream_imp.cpp
index 4ab3aeb1..de155cfa 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, TQTextStream *textstream )
+TextStreamImp::TextStreamImp( KJS::ExecState *exec, int mid, TTQTextStream *textstream )
     : JSProxyImp(exec), id(mid), ts(textstream)
 {
 }
@@ -47,7 +47,7 @@ void TextStreamImp::addBindings( KJS::ExecState *exec, KJS::Object &parent )
 	return;
     }
 
-    TQTextStream *ts = op->toTextStream();
+    TTQTextStream *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 )
 {
-    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 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 arg0 = extractQString(exec, args, 0);
+		TTQString arg0 = extractTQString(exec, args, 0);
 
-    TQIODevice *dev = ts->device();
+    TTQIODevice *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() ) {
-		TQString line = ts->readLine();
+		TTQString 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 c08470fc..7a2bf824 100644
--- a/kjsembed/builtins/textstream_imp.h
+++ b/kjsembed/builtins/textstream_imp.h
@@ -27,7 +27,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQTextStream;
+class TTQTextStream;
 
 namespace KJSEmbed {
 namespace BuiltIns {
@@ -51,7 +51,7 @@ public:
 	MethodFlush
     };
 
-    TextStreamImp( KJS::ExecState *exec, int id, TQTextStream *ts );
+    TextStreamImp( KJS::ExecState *exec, int id, TTQTextStream *ts );
     ~TextStreamImp();
 
     static void addBindings( KJS::ExecState *exec, KJS::Object &object );
@@ -64,7 +64,7 @@ public:
 
 private:
     int id;
-    TQTextStream *ts;
+    TTQTextStream *ts;
 
     class TextStreamImpPrivate *d;
 };
diff --git a/kjsembed/cpptests/jsaccess/jsaccess.cpp b/kjsembed/cpptests/jsaccess/jsaccess.cpp
index 6d22b412..5e2e7d6c 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();
 
-    TQString script = 	"var foobar = \"test from javascript.\";"
+    TTQString 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
     */
-    TQString value = part->getVariant("foobar").toString();
+    TTQString 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 104915d8..a29815f0 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;
-    TQObject *qobj = proxy->object();
-    TQWidget *widget = proxy->widget();
+    TTQObject *qobj = proxy->object();
+    TTQWidget *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) );
 
-	TQListBox *listbox = dynamic_cast<TQListBox *>( widget );
+	TTQListBox *listbox = dynamic_cast<TTQListBox *>( widget );
 	if ( listbox ) {
 	    obj = new CustomObjectImp( exec, ListBoxInsertItem, proxy );
 	    object.put( exec, "insertItem", KJS::Object(obj) );
 	}
 
-	TQListView *listview = dynamic_cast<TQListView *>( widget );
+	TTQListView *listview = dynamic_cast<TTQListView *>( widget );
 	if ( listview ) {
 	    obj = new CustomObjectImp( exec, ListViewAddColumn, proxy );
 	    object.put( exec, "addColumn", KJS::Object(obj) );
@@ -149,16 +149,16 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
       obj = new CustomObjectImp( exec, ListViewCurrentItem, proxy );
       object.put( exec, "currentItem", KJS::Object(obj) );
 	}
-	TQSplashScreen *splashscreen = dynamic_cast<TQSplashScreen *>(widget);
+	TTQSplashScreen *splashscreen = dynamic_cast<TTQSplashScreen *>(widget);
 	if( splashscreen )
 	{
-	     obj = new CustomObjectImp(exec, QSplashScreenSetPixmap, proxy );
+	     obj = new CustomObjectImp(exec, TQSplashScreenSetPixmap, proxy );
 	     object.put(exec, "setPixmap", KJS::Object(obj) );
-	     obj = new CustomObjectImp(exec, QSplashScreenPixmap, proxy );
+	     obj = new CustomObjectImp(exec, TQSplashScreenPixmap, proxy );
 	     object.put(exec, "pixmap", KJS::Object(obj) );
-	     obj = new CustomObjectImp(exec, QSplashScreenFinish, proxy );
+	     obj = new CustomObjectImp(exec, TQSplashScreenFinish, proxy );
 	     object.put(exec, "finish", KJS::Object(obj) );
-	     obj = new CustomObjectImp(exec, QSplashScreenRepaint, proxy );
+	     obj = new CustomObjectImp(exec, TQSplashScreenRepaint, proxy );
 	     object.put(exec, "repaint", KJS::Object(obj) );
 	}
 
@@ -189,13 +189,13 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 
 #endif // QT_ONLY
 
-	TQTabWidget *tw = dynamic_cast<TQTabWidget *>( widget );
+	TTQTabWidget *tw = dynamic_cast<TTQTabWidget *>( widget );
 	if ( tw ) {
 	    obj = new CustomObjectImp( exec, TabWidgetAddTab, proxy );
 	    object.put( exec, "addTab", KJS::Object(obj) );
 	}
 
-	TQScrollView *sv = dynamic_cast<TQScrollView *>( widget );
+	TTQScrollView *sv = dynamic_cast<TTQScrollView *>( widget );
 	if ( sv ) {
 	    obj = new CustomObjectImp( exec, ScrollViewViewport, proxy );
 	    object.put( exec, "viewport", KJS::Object(obj) );
@@ -203,66 +203,66 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 	    object.put( exec, "addChild", KJS::Object(obj) );
 	}
 
-	//ADDBINDING( QMenuItem, widget)
-	//ADDBINDING( QMenuData, widget)
+	//ADDBINDING( TQMenuItem, widget)
+	//ADDBINDING( TQMenuData, widget)
 
-	ADDBINDING( QPopupMenu, widget )
-	ADDBINDING( QComboBox, widget )
-	//ADDBINDING( QFrame, widget )
-	/*ADDBINDING( QListView, widget )*/
-	ADDBINDING( QCanvasView, widget )
+	ADDBINDING( TQPopupMenu, widget )
+	ADDBINDING( TQComboBox, widget )
+	//ADDBINDING( TQFrame, widget )
+	/*ADDBINDING( TQListView, widget )*/
+	ADDBINDING( TQCanvasView, widget )
 
 	/*
-	TQMenuData *md = dynamic_cast<TQMenuData *>( widget );
+	TTQMenuData *md = dynamic_cast<TTQMenuData *>( widget );
 	if ( md ) {
-		QMenuDataImp::addBindings( exec, object );
+		TQMenuDataImp::addBindings( exec, object );
 	}
 
-	TQMenuItem *mitem = dynamic_cast<TQMenuItem *>( widget );
+	TTQMenuItem *mitem = dynamic_cast<TTQMenuItem *>( widget );
 	if ( mitem ) {
-		QMenuItemImp::addBindings( exec, object );
+		TQMenuItemImp::addBindings( exec, object );
 	}
 	 */
-	TQMenuData *menuData = dynamic_cast<TQMenuData*>(widget);
+	TTQMenuData *menuData = dynamic_cast<TTQMenuData*>(widget);
 	if( menuData )
 	{
-            obj = new CustomObjectImp( exec, QMenuDataInsertItem, proxy );
+            obj = new CustomObjectImp( exec, TQMenuDataInsertItem, proxy );
 	    object.put( exec, "insertItem", KJS::Object(obj) );
-	    obj = new CustomObjectImp( exec, QMenuDataRemoveItem, proxy );
+	    obj = new CustomObjectImp( exec, TQMenuDataRemoveItem, proxy );
 	    object.put( exec, "removeItem", KJS::Object(obj) );
-	    obj = new CustomObjectImp( exec, QMenuDataRemoveItem, proxy );
+	    obj = new CustomObjectImp( exec, TQMenuDataRemoveItem, proxy );
 	    object.put( exec, "insertSeparator", KJS::Object(obj) );
 	}
 
-	TQHBox *hbox = dynamic_cast<TQHBox *>( widget );
+	TTQHBox *hbox = dynamic_cast<TTQHBox *>( widget );
 	if ( hbox ) {
 	    obj = new CustomObjectImp( exec, HBoxSpacing, proxy );
 	    object.put( exec, "setSpacing", KJS::Object(obj) );
 	}
-	TQToolBox *tb = dynamic_cast<TQToolBox *>( qobj );
+	TTQToolBox *tb = dynamic_cast<TTQToolBox *>( qobj );
 	if ( tb ) {
-	    obj = new CustomObjectImp( exec, QToolBoxAddItem, proxy );
+	    obj = new CustomObjectImp( exec, TQToolBoxAddItem, proxy );
 	    object.put( exec, "addItem", KJS::Object(obj) );
-	    obj = new CustomObjectImp( exec, QToolBoxInsertItem, proxy );
+	    obj = new CustomObjectImp( exec, TQToolBoxInsertItem, proxy );
 	    object.put( exec, "insertItem", KJS::Object(obj) );
-	    obj = new CustomObjectImp( exec, QToolBoxRemoveItem, proxy );
+	    obj = new CustomObjectImp( exec, TQToolBoxRemoveItem, proxy );
 	    object.put( exec, "removeItem", KJS::Object(obj) );
-	    obj = new CustomObjectImp( exec, QToolBoxItemLabel, proxy );
+	    obj = new CustomObjectImp( exec, TQToolBoxItemLabel, proxy );
 	    object.put( exec, "itemLabel", KJS::Object(obj) );
-	    obj = new CustomObjectImp( exec, QToolBoxSetItemLabel, proxy );
+	    obj = new CustomObjectImp( exec, TQToolBoxSetItemLabel, proxy );
 	    object.put( exec, "setItemLabel", KJS::Object(obj) );
-	    obj = new CustomObjectImp( exec, QToolBoxItemIconSet, proxy );
+	    obj = new CustomObjectImp( exec, TQToolBoxItemIconSet, proxy );
 	    object.put( exec, "itemIconSet", KJS::Object(obj) );
-	    obj = new CustomObjectImp( exec, QToolBoxSetItemIconSet, proxy );
+	    obj = new CustomObjectImp( exec, TQToolBoxSetItemIconSet, proxy );
 	    object.put( exec, "setItemIconSet", KJS::Object(obj) );
-	    obj = new CustomObjectImp( exec, QToolBoxItem, proxy );
+	    obj = new CustomObjectImp( exec, TQToolBoxItem, proxy );
 	    object.put( exec, "item", KJS::Object(obj) );
     	}
 	return;
     }
 
     if ( qobj ) {
-	TQApplication *app = dynamic_cast<TQApplication *>( qobj );
+	TTQApplication *app = dynamic_cast<TTQApplication *>( 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
 
-	TQTimer *timer = dynamic_cast<TQTimer *>( qobj );
+	TTQTimer *timer = dynamic_cast<TTQTimer *>( 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) );
 	}
 
-	TQBoxLayout *box = dynamic_cast<TQBoxLayout *>( qobj );
+	TTQBoxLayout *box = dynamic_cast<TTQBoxLayout *>( qobj );
 	if ( box ) {
 	    obj = new CustomObjectImp( exec, BoxLayoutAddWidget, proxy );
 	    object.put( exec, "addWidget", KJS::Object(obj) );
@@ -453,60 +453,60 @@ KJS::Value CustomObjectImp::call( KJS::ExecState *exec, KJS::Object &self, const
 	case KSystemTrayLoadIcon:
 	    return ksystemtrayLoadIcon( exec, self, args );
 	    break;
-	case QCanvasViewCanvas:
+	case TQCanvasViewCanvas:
 	    return qcanvasViewCanvas( exec, self, args );
 	    break;
-	case QCanvasViewSetCanvas:
+	case TQCanvasViewSetCanvas:
 	    qcanvasViewSetCanvas( exec, self, args );
 	    return KJS::Value();
 	    break;
-	case QSplashScreenSetPixmap:
+	case TQSplashScreenSetPixmap:
 	    return qsplashScreenSetPixmap(exec, self, args );
 	    break;
-	case QSplashScreenPixmap:
+	case TQSplashScreenPixmap:
 	    return qsplashScreenPixmap(exec, self, args );
 	    break;
-	case QSplashScreenFinish:
+	case TQSplashScreenFinish:
 	    return qsplashScreenFinish(exec, self, args );
 	    break;
-	case QSplashScreenRepaint:
+	case TQSplashScreenRepaint:
 	    return qsplashScreenRepaint(exec, self, args );
 	    break;
-	case QToolBoxAddItem:
+	case TQToolBoxAddItem:
 		return qtoolBoxAddItem(exec, self, args );
 		break;
-	case QToolBoxInsertItem:
+	case TQToolBoxInsertItem:
 		return qtoolBoxInsertItem(exec, self, args );
 		break;
-	case QToolBoxRemoveItem:
+	case TQToolBoxRemoveItem:
 		qtoolBoxRemoveItem(exec, self, args );
 		return KJS::Boolean(true);
 		break;
-	case QToolBoxItemLabel:
+	case TQToolBoxItemLabel:
 		return qtoolBoxItemLabel(exec, self, args );
 		break;
-	case QToolBoxSetItemLabel:
+	case TQToolBoxSetItemLabel:
 		qtoolBoxSetItemLabel(exec, self, args );
 		return KJS::Boolean(true);
 		break;
-	case QToolBoxItemIconSet:
+	case TQToolBoxItemIconSet:
 		return qtoolBoxItemIconSet(exec, self, args );
 		break;
-	case QToolBoxSetItemIconSet:
+	case TQToolBoxSetItemIconSet:
 		qtoolBoxSetItemIconSet(exec, self, args );
 		return KJS::Boolean(true);
 		break;
-	case QToolBoxItem:
+	case TQToolBoxItem:
 		return qtoolBoxItem(exec, self, args );
 		break;
-	case QMenuDataInsertItem:
+	case TQMenuDataInsertItem:
 		return qmenuDataInsertItem(exec, self, args );
 		break;
-	case QMenuDataRemoveItem:
+	case TQMenuDataRemoveItem:
 		qmenuDataRemoveItem(exec, self, args );
 		return KJS::Boolean(true);
 		break;
-	case QMenuDataInsertSeparator:
+	case TQMenuDataInsertSeparator:
 		qmenuDataInsertSeparator(exec, self, args );
 		return KJS::Boolean(true);
 		break;
@@ -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 )
 {
-	TQSplashScreen *ss = dynamic_cast<TQSplashScreen*>(proxy->widget());
+	TTQSplashScreen *ss = dynamic_cast<TTQSplashScreen*>(proxy->widget());
     	if ( ss )
 	{
-		TQPixmap pix = extractQPixmap(exec, args, 0 );
+		TTQPixmap 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 & )
 {
-	TQSplashScreen *ss = dynamic_cast<TQSplashScreen*>(proxy->widget());
+	TTQSplashScreen *ss = dynamic_cast<TTQSplashScreen*>(proxy->widget());
     	if ( ss )
 	{
-		TQPixmap pix = *(ss->pixmap());
+		TTQPixmap 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 )
 {
-	TQSplashScreen *ss = dynamic_cast<TQSplashScreen*>(proxy->widget());
+	TTQSplashScreen *ss = dynamic_cast<TTQSplashScreen*>(proxy->widget());
     	if ( ss )
 	{
-		TQWidget *w = extractQWidget(exec, args, 0 );
+		TTQWidget *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 & )
 {
-	TQSplashScreen *ss = dynamic_cast<TQSplashScreen*>(proxy->widget());
+	TTQSplashScreen *ss = dynamic_cast<TTQSplashScreen*>(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 & )
 {
-    TQWidget *w = proxy->widget();
+    TTQWidget *w = proxy->widget();
     if ( !w )
 	return KJS::Value();
-    TQVariant pix(TQPixmap::grabWidget(w) );
+    TTQVariant pix(TTQPixmap::grabWidget(w) );
     return convertToValue( exec, pix );
 
 }
@@ -585,7 +585,7 @@ void CustomObjectImp::widgetDrawLine( KJS::ExecState *exec, KJS::Object &, const
     if ( args.size() != 4 )
 	return;
 
-    TQWidget *w = proxy->widget();
+    TTQWidget *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 );
 
-    TQPainter p(w);
+    TTQPainter 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;
 
-    TQWidget *w = proxy->widget();
+    TTQWidget *w = proxy->widget();
     if ( !w )
 	return;
 
 		int x = extractInt( exec, args, 0 );
 		int y = extractInt( exec, args, 1 );
-		TQString s = extractQString( exec, args, 2 );
+		TTQString 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;
 
-    TQListBox *lb = dynamic_cast<TQListBox *>( proxy->object() );
+    TTQListBox *lb = dynamic_cast<TTQListBox *>( proxy->object() );
     if ( !lb )
 	return;
 
-		TQString s = extractQString( exec, args, 0 );
+		TTQString 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;
 
-    TQListView *lv = dynamic_cast<TQListView *>( proxy->object() );
+    TTQListView *lv = dynamic_cast<TTQListView *>( proxy->object() );
     if ( !lv )
 	return;
 
-		TQString s = extractQString( exec, args, 0 );
+		TTQString 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){
-		TQVariant arg = convertToVariant(exec, args[idx]);
-		if( arg.canCast(TQVariant::String) )
+		TTQVariant arg = convertToVariant(exec, args[idx]);
+		if( arg.canCast(TTQVariant::String) )
 			lvm->setText(idx, arg.toString());
-		else if ( arg.canCast(TQVariant::Pixmap) )
+		else if ( arg.canCast(TTQVariant::Pixmap) )
 			lvm->setPixmap(idx, arg.toPixmap());
 	}
 	return;
@@ -662,15 +662,15 @@ void CustomObjectImp::listViewInsertItem( KJS::ExecState *exec, KJS::Object &, c
 
 #endif // QT_ONLY
 
-    TQListView *lv = dynamic_cast<TQListView *>( proxy->object() );
+    TTQListView *lv = dynamic_cast<TTQListView *>( proxy->object() );
     if ( lv ) {
-	TQListViewItem *lvm = new TQListViewItem(lv);
+	TTQListViewItem *lvm = new TTQListViewItem(lv);
 
 	for( int idx = 0; idx < args.size(); ++idx){
-		TQVariant arg = convertToVariant(exec, args[idx]);
-		if( arg.canCast(TQVariant::String) )
+		TTQVariant arg = convertToVariant(exec, args[idx]);
+		if( arg.canCast(TTQVariant::String) )
 			lvm->setText(idx, arg.toString());
-		else if ( arg.canCast(TQVariant::Pixmap) )
+		else if ( arg.canCast(TTQVariant::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();
 
-    TQListView *lv = dynamic_cast<TQListView *>( proxy->object() );
+    TTQListView *lv = dynamic_cast<TTQListView *>( proxy->object() );
     if ( !lv )
 	return KJS::Value();
 
-    TQListViewItem *lvi = lv->selectedItem();
+    TTQListViewItem *lvi = lv->selectedItem();
     if ( !lvi )
  	return KJS::Null();
 
-    TQCheckListItem *cli = dynamic_cast<TQCheckListItem *>( lvi );
+    TTQCheckListItem *cli = dynamic_cast<TTQCheckListItem *>( lvi );
     if ( cli ) {
-	JSOpaqueProxy *prx = new JSOpaqueProxy( lvi, "TQCheckListItem" );
+	JSOpaqueProxy *prx = new JSOpaqueProxy( lvi, "TTQCheckListItem" );
 	KJS::Object proxyObj(prx);
         proxy->part()->factory()->extendOpaqueProxy(exec, proxyObj);
 	return proxyObj;
     }
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( lvi, "TQListViewItem" );
+    JSOpaqueProxy *prx = new JSOpaqueProxy( lvi, "TTQListViewItem" );
     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;
 
-    TQListView *lv = dynamic_cast<TQListView *>( proxy->object() );
+    TTQListView *lv = dynamic_cast<TTQListView *>( 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() );
-    TQWidget *cw = cwproxy ? cwproxy->widget() : 0;
+    TTQWidget *cw = cwproxy ? cwproxy->widget() : 0;
     if ( !cw )
 	return;
     KMainWindow *mw = dynamic_cast<KMainWindow *>( proxy->object() );
@@ -775,7 +775,7 @@ void CustomObjectImp::mainWinCreateGUI( KJS::ExecState *exec, KJS::Object &, con
 	return;
     }
 
-		mw->createGUI( extractQString( exec, args, 0 ) );
+		mw->createGUI( extractTQString( exec, args, 0 ) );
 #else // QT_ONLY
     Q_UNUSED( exec );
     Q_UNUSED( args );
@@ -793,7 +793,7 @@ KJS::Value CustomObjectImp::mainWinMenuBar( KJS::ExecState *exec, KJS::Object &,
 	return KJS::Value();
     }
 
-    TQObject *obj = mw->menuBar();
+    TTQObject *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();
     }
 
-    TQObject *obj = mw->statusBar();
+    TTQObject *obj = mw->statusBar();
     return proxy->part()->factory()->createProxy( exec, obj, proxy );
 
 #else // QT_ONLY
@@ -853,28 +853,28 @@ void CustomObjectImp::tabWidgetAddTab( KJS::ExecState *exec, KJS::Object&, const
     if ( args.size() < 2 )
 	return;
 
-    TQTabWidget *tw = dynamic_cast<TQTabWidget *>( proxy->object() );
+    TTQTabWidget *tw = dynamic_cast<TTQTabWidget *>( proxy->object() );
     if ( !tw )
 	return;
 
     KJS::Object jsobj = args[0].toObject(exec);
     JSObjectProxy *tproxy = JSProxy::toObjectProxy( jsobj.imp() );
-    TQWidget *w = tproxy ? tproxy->widget() : 0;
+    TTQWidget *w = tproxy ? tproxy->widget() : 0;
     if ( !w )
 	return;
 
-		tw->addTab( w, extractQString( exec, args, 0 ) );
+		tw->addTab( w, extractTQString( exec, args, 0 ) );
 }
 
 KJS::Value CustomObjectImp::scrollViewViewport( KJS::ExecState *exec, KJS::Object&, const KJS::List &args )
 {
-    TQScrollView *sv = dynamic_cast<TQScrollView *>( proxy->object() );
+    TTQScrollView *sv = dynamic_cast<TTQScrollView *>( proxy->object() );
     if ( !sv )
 	return KJS::Value();
 
     KJS::Object jsobj = args[0].toObject(exec);
     JSObjectProxy *sproxy = JSProxy::toObjectProxy( jsobj.imp() );
-    TQWidget *w = sproxy ? sproxy->widget() : 0;
+    TTQWidget *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;
 
-    TQScrollView *sv = dynamic_cast<TQScrollView *>( proxy->object() );
+    TTQScrollView *sv = dynamic_cast<TTQScrollView *>( proxy->object() );
     if ( !sv )
 	return;
 
     KJS::Object jsobj = args[0].toObject(exec);
     JSObjectProxy *sproxy = JSProxy::toObjectProxy( jsobj.imp() );
-    TQWidget *w = sproxy ? sproxy->widget() : 0;
+    TTQWidget *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& )
 {
-    TQApplication *app = dynamic_cast<TQApplication *>( proxy->object() );
+    TTQApplication *app = dynamic_cast<TTQApplication *>( 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 & )
 {
-    TQTimer *timer = dynamic_cast<TQTimer *>( proxy->object() );
+    TTQTimer *timer = dynamic_cast<TTQTimer *>( 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 )
 {
-    TQTimer *timer = dynamic_cast<TQTimer *>( proxy->object() );
+    TTQTimer *timer = dynamic_cast<TTQTimer *>( 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 & )
 {
-    TQTimer *timer = dynamic_cast<TQTimer *>( proxy->object() );
+    TTQTimer *timer = dynamic_cast<TTQTimer *>( 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;
 
-    TQBoxLayout *box = dynamic_cast<TQBoxLayout *>( proxy->object() );
+    TTQBoxLayout *box = dynamic_cast<TTQBoxLayout *>( proxy->object() );
     if ( !box )
 	return;
 
     KJS::Object jsobj = args[0].toObject(exec);
     JSObjectProxy *proxy = JSProxy::toObjectProxy( jsobj.imp() );
-    TQWidget *w = proxy ? proxy->widget() : 0;
+    TTQWidget *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;
 
-    TQBoxLayout *box = dynamic_cast<TQBoxLayout *>( proxy->object() );
+    TTQBoxLayout *box = dynamic_cast<TTQBoxLayout *>( proxy->object() );
     if ( !box )
 	return;
 
@@ -987,7 +987,7 @@ void CustomObjectImp::boxLayoutAddStretch( KJS::ExecState *exec, KJS::Object &,
     if ( args.size() > 1 )
 	return;
 
-    TQBoxLayout *box = dynamic_cast<TQBoxLayout *>( proxy->object() );
+    TTQBoxLayout *box = dynamic_cast<TTQBoxLayout *>( 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;
 
-    TQBoxLayout *box = dynamic_cast<TQBoxLayout *>( proxy->object() );
+    TTQBoxLayout *box = dynamic_cast<TTQBoxLayout *>( proxy->object() );
     if ( !box )
 	return;
 
     KJS::Object jsobj = args[0].toObject(exec);
     JSObjectProxy *proxy = JSProxy::toObjectProxy( jsobj.imp() );
-    TQLayout *l = proxy ? (dynamic_cast<TQLayout *>(proxy->object())) : 0;
+    TTQLayout *l = proxy ? (dynamic_cast<TTQLayout *>(proxy->object())) : 0;
     if ( !l )
 	return;
 
@@ -1029,8 +1029,8 @@ KJS::Value CustomObjectImp::kroPartOpenStream( KJS::ExecState *exec, KJS::Object
     if ( !ro )
 	return KJS::Boolean( false );
 
-		bool ok = ro->openStream( extractQString( exec, args, 0 )
-				, KURL(extractQString( exec, args, 1 )) );
+		bool ok = ro->openStream( extractTQString( exec, args, 0 )
+				, KURL(extractTQString( exec, args, 1 )) );
     return KJS::Boolean( ok );
 
 #else // QT_ONLY
@@ -1051,7 +1051,7 @@ KJS::Value CustomObjectImp::kroPartWriteStream( KJS::ExecState *exec, KJS::Objec
     if ( !ro )
 	return KJS::Boolean( false );
 
-		TQCString s = extractQString( exec, args, 0 ).latin1();
+		TTQCString 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;
 
-    TQHBox *box = dynamic_cast<TQHBox *>( proxy->object() );
+    TTQHBox *box = dynamic_cast<TTQHBox *>( 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();
 
-    TQVariant pix( KSystemTray::loadIcon( extractQString( exec, args, 0 ) ) );
+    TTQVariant 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 )
 {
-    TQCanvasView *cv = dynamic_cast<TQCanvasView *>( proxy->object() );
+    TTQCanvasView *cv = dynamic_cast<TTQCanvasView *>( 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 )
 {
-    TQCanvasView *cv = dynamic_cast<TQCanvasView *>( proxy->object() );
+    TTQCanvasView *cv = dynamic_cast<TTQCanvasView *>( proxy->object() );
     if ( !cv )
 	return;
 
     KJS::Object jsobj = args[0].toObject(exec);
     JSObjectProxy *proxy = JSProxy::toObjectProxy( jsobj.imp() );
 
-    TQObject *obj = proxy->object();
+    TTQObject *obj = proxy->object();
     if ( !obj )
 	return;
 
-    TQCanvas *c = (TQCanvas *) obj;
+    TTQCanvas *c = (TTQCanvas *) obj;
     cv->setCanvas(c);
 }
 KJS::Value Bindings::CustomObjectImp::qlistViewTakeItem( KJS::ExecState * exec, KJS::Object &, const KJS::List &args )
 {
-    TQListView *lv = dynamic_cast<TQListView *>( proxy->object() );
+    TTQListView *lv = dynamic_cast<TTQListView *>( proxy->object() );
     if( !lv )
         return KJS::Boolean(false);
     KJS::Object lviObj = args[0].toObject(exec);
     JSOpaqueProxy *prxy = JSProxy::toOpaqueProxy(lviObj.imp() );
-    TQListViewItem *itm = prxy->toNative<TQListViewItem>();
+    TTQListViewItem *itm = prxy->toNative<TTQListViewItem>();
     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 )
 {
-    TQListView *lv = dynamic_cast<TQListView *>( proxy->object() );
+    TTQListView *lv = dynamic_cast<TTQListView *>( proxy->object() );
     if( !lv )
         return KJS::Boolean(false);
-    TQListViewItem *itm = lv->firstChild();
-    KJS::Object jsObject( new JSOpaqueProxy( itm, "TQListViewItem") );
+    TTQListViewItem *itm = lv->firstChild();
+    KJS::Object jsObject( new JSOpaqueProxy( itm, "TTQListViewItem") );
     proxy->part()->factory()->extendOpaqueProxy(exec, jsObject);
     return jsObject;
 }
 
 KJS::Value Bindings::CustomObjectImp::qlistViewCurrentItem( KJS::ExecState * exec, KJS::Object &, const KJS::List &args )
 {
-    TQListView *lv = dynamic_cast<TQListView *>( proxy->object() );
+    TTQListView *lv = dynamic_cast<TTQListView *>( proxy->object() );
     if( !lv )
         return KJS::Boolean(false);
-    TQListViewItem *itm = lv->currentItem();
-    KJS::Object jsObject( new JSOpaqueProxy( itm, "TQListViewItem") );
+    TTQListViewItem *itm = lv->currentItem();
+    KJS::Object jsObject( new JSOpaqueProxy( itm, "TTQListViewItem") );
     proxy->part()->factory()->extendOpaqueProxy(exec, jsObject);
     return jsObject;
 }
 
 KJS::Value Bindings::CustomObjectImp::qtoolBoxAddItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args)
 {
-    TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() );
+    TTQToolBox *tb = dynamic_cast<TTQToolBox *>( proxy->object() );
     if( !tb )
         return KJS::Boolean(false);
     if( args.size() == 2)
     {
-        TQWidget *w = extractQWidget( exec, args, 0 );
-        TQString lab = extractQString( exec, args, 1 );
+        TTQWidget *w = extractTQWidget( exec, args, 0 );
+        TTQString lab = extractTQString( exec, args, 1 );
         return KJS::Number( tb->addItem(w,lab) );
     }
     if( args.size() == 3)
     {
-        TQWidget *w = extractQWidget( exec, args, 0 );
-        TQIconSet ico = extractQPixmap( exec, args, 1 );
-        TQString lab = extractQString( exec, args, 2 );
+        TTQWidget *w = extractTQWidget( exec, args, 0 );
+        TTQIconSet ico = extractTQPixmap( exec, args, 1 );
+        TTQString 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 )
 {
-    TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() );
+    TTQToolBox *tb = dynamic_cast<TTQToolBox *>( proxy->object() );
     if( !tb )
         return KJS::Boolean(false);
     if( args.size() == 3)
     {
         int idx = extractInt(exec, args, 0);
-        TQWidget *w = extractQWidget( exec, args, 1 );
-        TQString lab = extractQString( exec, args, 2 );
+        TTQWidget *w = extractTQWidget( exec, args, 1 );
+        TTQString lab = extractTQString( exec, args, 2 );
         return KJS::Number( tb->insertItem(idx,w,lab) );
     }
     if( args.size() == 4)
     {
         int idx = extractInt(exec, args, 0);
-        TQWidget *w = extractQWidget( exec, args, 1 );
-        TQIconSet ico = extractQPixmap( exec, args, 2 );
-        TQString lab = extractQString( exec, args, 3 );
+        TTQWidget *w = extractTQWidget( exec, args, 1 );
+        TTQIconSet ico = extractTQPixmap( exec, args, 2 );
+        TTQString 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 )
 {
-    TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() );
+    TTQToolBox *tb = dynamic_cast<TTQToolBox *>( proxy->object() );
     if( !tb )
         return;
-    TQWidget *w = extractQWidget(exec, args, 0);
+    TTQWidget *w = extractTQWidget(exec, args, 0);
     tb->removeItem(w);
 }
 
 KJS::Value Bindings::CustomObjectImp::qtoolBoxItemLabel(KJS::ExecState *exec, KJS::Object &, const KJS::List &args )
 {
-    TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() );
+    TTQToolBox *tb = dynamic_cast<TTQToolBox *>( proxy->object() );
     if( !tb )
         return KJS::Boolean(false);
     int idx = extractInt(exec, args, 0);
@@ -1301,69 +1301,69 @@ KJS::Value Bindings::CustomObjectImp::qtoolBoxItemLabel(KJS::ExecState *exec, KJ
 
 void Bindings::CustomObjectImp::qtoolBoxSetItemLabel(KJS::ExecState *exec, KJS::Object &, const KJS::List &args )
 {
-    TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() );
+    TTQToolBox *tb = dynamic_cast<TTQToolBox *>( proxy->object() );
     if( !tb )
         return;
 
     int idx = extractInt(exec, args, 0);
-    TQString lab = extractQString( exec, args, 1 );
+    TTQString lab = extractTQString( exec, args, 1 );
     tb->setItemLabel(idx,lab);
 }
 
 KJS::Value Bindings::CustomObjectImp::qtoolBoxItemIconSet(KJS::ExecState *exec, KJS::Object &, const KJS::List &args )
 {
-    TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() );
+    TTQToolBox *tb = dynamic_cast<TTQToolBox *>( proxy->object() );
     if( !tb )
         return KJS::Boolean(false);
     int idx = extractInt(exec, args, 0);
-    TQPixmap pix = tb->itemIconSet(idx).pixmap();
+    TTQPixmap pix = tb->itemIconSet(idx).pixmap();
     return convertToValue( exec, pix );
 
 }
 
 void Bindings::CustomObjectImp::qtoolBoxSetItemIconSet(KJS::ExecState *exec, KJS::Object &, const KJS::List &args)
 {
-    TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() );
+    TTQToolBox *tb = dynamic_cast<TTQToolBox *>( proxy->object() );
     if( !tb )
         return;
     int idx = extractInt(exec, args, 0);
-    TQIconSet ico = extractQPixmap( exec, args, 1);
+    TTQIconSet ico = extractTQPixmap( exec, args, 1);
     tb->setItemIconSet(idx,ico);
 }
 
 KJS::Value Bindings::CustomObjectImp::qtoolBoxItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args )
 {
-    TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() );
+    TTQToolBox *tb = dynamic_cast<TTQToolBox *>( proxy->object() );
     if( !tb )
         return KJS::Boolean(false);
     int idx = extractInt(exec, args, 0);
     return proxy->part()->factory()->createProxy( exec, tb->item(idx), proxy );
 }
-TQPopupMenu *getMenu(const KJS::Object &obj)
+TTQPopupMenu *getMenu(const KJS::Object &obj)
 {
     JSObjectProxy *jsproxy = JSProxy::toObjectProxy( obj.imp() );
-    return dynamic_cast<TQPopupMenu *>( jsproxy->object() );
+    return dynamic_cast<TTQPopupMenu *>( jsproxy->object() );
 }
 
 KJS::Value Bindings::CustomObjectImp::qmenuDataInsertItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args )
 {
-    TQMenuData *menu = dynamic_cast<TQMenuData *>( proxy->object() );
+    TTQMenuData *menu = dynamic_cast<TTQMenuData *>( proxy->object() );
     if( !menu )
         return KJS::Boolean(false);
     int offset = 0;
 
-    TQString text = extractQString(exec,args, offset);
-    TQPixmap pix = extractQPixmap(exec,args, offset);
+    TTQString text = extractTQString(exec,args, offset);
+    TTQPixmap pix = extractTQPixmap(exec,args, offset);
     int id = -1;
     int idx = -1;
     int newIndex = 0;
-    TQPopupMenu  *parentMenu = 0;
+    TTQPopupMenu  *parentMenu = 0;
 
     if( !pix.isNull() )
     {
         ++offset;
         if( args.size() > offset)
-            text = extractQString(exec,args,offset);
+            text = extractTQString(exec,args,offset);
     }
     kdDebug() << "text " << text << " " << offset << endl;
 
@@ -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 )
 {
-    TQMenuData *menu = dynamic_cast<TQMenuData *>( proxy->object() );
+    TTQMenuData *menu = dynamic_cast<TTQMenuData *>( 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 )
 {
-    TQMenuData *menu = dynamic_cast<TQMenuData *>( proxy->object() );
+    TTQMenuData *menu = dynamic_cast<TTQMenuData *>( 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 50926dc0..74658a1f 100644
--- a/kjsembed/customobject_imp.h
+++ b/kjsembed/customobject_imp.h
@@ -28,7 +28,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQObject;
+class TTQObject;
 
 namespace KJSEmbed {
 namespace Bindings {
@@ -104,26 +104,26 @@ public:
 	KSystemTrayActionCollection,
 	KSystemTrayLoadIcon,
 
-	QCanvasViewCanvas,
-	QCanvasViewSetCanvas,
-
-	QSplashScreenSetPixmap,
-	QSplashScreenPixmap,
-	QSplashScreenFinish,
-	QSplashScreenRepaint,
-
-	QToolBoxAddItem,
-	QToolBoxInsertItem,
-	QToolBoxRemoveItem,
-	QToolBoxItemLabel,
-	QToolBoxSetItemLabel,
-	QToolBoxItemIconSet,
-	QToolBoxSetItemIconSet,
-	QToolBoxItem,
-
-	QMenuDataInsertItem,
-	QMenuDataRemoveItem,
-	QMenuDataInsertSeparator
+	TQCanvasViewCanvas,
+	TQCanvasViewSetCanvas,
+
+	TQSplashScreenSetPixmap,
+	TQSplashScreenPixmap,
+	TQSplashScreenFinish,
+	TQSplashScreenRepaint,
+
+	TQToolBoxAddItem,
+	TQToolBoxInsertItem,
+	TQToolBoxRemoveItem,
+	TQToolBoxItemLabel,
+	TQToolBoxSetItemLabel,
+	TQToolBoxItemIconSet,
+	TQToolBoxSetItemIconSet,
+	TQToolBoxItem,
+
+	TQMenuDataInsertItem,
+	TQMenuDataRemoveItem,
+	TQMenuDataInsertSeparator
     };
 
     static void addBindings( KJS::ExecState *exec, KJS::Object &object );
diff --git a/kjsembed/design.h b/kjsembed/design.h
index cf156222..e8bdbbc0 100644
--- a/kjsembed/design.h
+++ b/kjsembed/design.h
@@ -25,7 +25,7 @@
  * The KJSEmbed library provides a framework that makes it easy for
  * applications to embed KJS, the KDE JavaScript interpreter. The
  * facilities available include a JS console widget, a dialog loader
- * and a binding between JS and the properties and slots of QObjects.
+ * and a binding between JS and the properties and slots of TQObjects.
  *
  * @section classes Important Classes
  *
@@ -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 TQObject,
+ *   A Javascript object that can access the properties of a TTQObject,
  *
  * @ref KJSEmbed::SecurityPolicy :
  *   Defines a security policy for @ref JSObjectProxy.
@@ -64,19 +64,19 @@
  *    KJSEmbed::JSConsoleWidget *console = js->view();
  * </pre>
  *
- * @section proxy Publishing QObjects
+ * @section proxy Publishing TQObjects
  *
- * KJSEmbed allows applications to make arbitrary QObjects visible to a
+ * KJSEmbed allows applications to make arbitrary TQObjects visible to a
  * Javascript interpreter. The binding itself is provided by the @ref JSProxyObject
  * 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 TQVBox containing two QLabels then makes them visible
+ * scripting. It creates a TTQVBox containing two TQLabels then makes them visible
  * to KJSEmbed:
  * <pre>
- *    TQVBox *toplevel = new TQVBox( 0, "box" );
- *    TQLabel *title = new TQLabel( "Some Title", toplevel, "title");
- *    TQLabel *main = new TQLabel( "Some text, more text.", toplevel, "main" );
+ *    TTQVBox *toplevel = new TTQVBox( 0, "box" );
+ *    TTQLabel *title = new TTQLabel( "Some Title", toplevel, "title");
+ *    TTQLabel *main = new TTQLabel( "Some text, more text.", toplevel, "main" );
  *
  *    js->addObject( title );
  *    js->addObject( main, "text" );
@@ -92,18 +92,18 @@
  * </pre>
  * The script above would set the text of the label to 'Hello World'.
  *
- * The slots of a TQObject bound to the interpreter are made available to
+ * The slots of a TTQObject 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:
  * <pre>
  *    main.hide()
  * </pre>
  *
- * @section tree Access To the TQObject Tree
+ * @section tree Access To the TTQObject Tree
  *
  * As well as providing script access to an individual widget, KJSEmbed
  * allows scripts to walk the object tree and access others.  If we
- * modified the previous example to publish the QBox widget 'toplevel' as
+ * modified the previous example to publish the TQBox widget 'toplevel' as
  * follows:
  * <pre>
  *    js->addObject( toplevel, "window" );
@@ -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 TQObject based class the the global scope of the
+ * This will then add any TTQObject 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.
@@ -146,12 +146,12 @@
  * @until callMethod
  * Any arguments that you wish to pass into the javascript method are contained in the
  * @ref KJS::List. This is just a list of @ref KJS::Value objects and can be created from
- * QVariants or from custom @ref KJS::Object based classes.
+ * 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 TQVariant with the @ref KJSEmbed::convertToVariant method.
+ * type to a TTQVariant with the @ref KJSEmbed::convertToVariant method.
  * @line personalData
  * @until notes:
- * Complex arrays or @ref KJS::Objects are transparently converted to TQVariant::Map types so
+ * Complex arrays or @ref KJS::Objects are transparently converted to TTQVariant::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/ChangeLog b/kjsembed/docs/ChangeLog
index f5d5ff03..a201c55c 100644
--- a/kjsembed/docs/ChangeLog
+++ b/kjsembed/docs/ChangeLog
@@ -25,7 +25,7 @@
 
 2004-12-11 Saturday 07:15  geiseri
 
-	Use extractQObject here because it is safer.
+	Use extractTQObject here because it is safer.
 
 2004-12-11 Saturday 07:15  geiseri
 
@@ -73,43 +73,43 @@
 
 2004-12-10 Friday 12:59  geiseri
 
-	Implemented better QVariant to JSObject mappings.  The big change here
-	that Javascript arrays and Javascript objects can be mapped to QVariants
+	Implemented better TQVariant to JSObject mappings.  The big change here
+	that Javascript arrays and Javascript objects can be mapped to TQVariants
 	in C++.  Conversions break down as follows:
-	QStringList -> Array of javascript strings.
-	QValueList<QVariant> -> Array of Javascript values.
-	QMap<QString,QVariant> -> Object/Array that has each QString key as
-		a property, and the QVariant is mapped to a Javascript value.
+	TQStringList -> Array of javascript strings.
+	TQValueList<TQVariant> -> Array of Javascript values.
+	TQMap<TQString,TQVariant> -> Object/Array that has each TQString key as
+		a property, and the TQVariant is mapped to a Javascript value.
 
 	From Javascript the conversions are a little different.
 	All arrays that have a numeric index will be converted to
-	QValueList<QVariant> QVariants.  These can be mapped to both
-	QStringList and to normal QValueList.  An example would be like this:
+	TQValueList<TQVariant> TQVariants.  These can be mapped to both
+	TQStringList and to normal TQValueList.  An example would be like this:
 	KJS::Value someArrayValue;
-	QStringList strLst = convertToVariant(exec, someArrayValue).toStringList();
-	QValueList<QVariant> varLst
+	TQStringList strLst = convertToVariant(exec, someArrayValue).toStringList();
+	TQValueList<TQVariant> varLst
 		= convertToVariant( exec,  someArrayValue).toList();
 
 	Now if the Javascript value is a Javascript object or a map then
-	the conversion will go to a QMap<QString,QVariant>.  An example of
+	the conversion will go to a TQMap<TQString,TQVariant>.  An example of
 	this would be like:
 	KJS::Value someJSObject;
-	QMap<QString,QVariant> map = convertToVariant(exec,someJSObject)
+	TQMap<TQString,TQVariant> map = convertToVariant(exec,someJSObject)
 					.toMap();
-	QString someVal = map["someProp"].toString();
+	TQString someVal = map["someProp"].toString();
 
 	This is done via some testing of the array and you can trip
 	it up in some cases:
-	1) If the object is empty, or null will return an empty QMap
+	1) If the object is empty, or null will return an empty TQMap
 	2) If the object is an array that has the last element null
-		then a QMap will be returned.
+		then a TQMap will be returned.
 
 	The first case is not much of an issue because an empty variant
 	is the same for all types, but the second case can cause
 	unexpected results.
 
 	In cases of sparse arrays the empty values will be filled in
-	with empty QVariants in the QValueList.
+	with empty TQVariants in the TQValueList.
 
 2004-12-10 Friday 12:42  geiseri
 
@@ -117,7 +117,7 @@
 	Example shows the following:
 	1) Embedding KJSEmbed.
 	2) Calling Javascript methods from C++.
-	3) Transparent mapping of custom javascript objects into QVariant maps.
+	3) Transparent mapping of custom javascript objects into TQVariant maps.
 	4) Adding widgets to a C++ based form from Javascript.
 	5) Execution of a script from outside of the main application.
 
@@ -127,7 +127,7 @@
 
 2004-12-09 Thursday 15:09  geiseri
 
-	torture test for QFrame, still fails.
+	torture test for TQFrame, still fails.
 
 2004-12-09 Thursday 15:07  geiseri
 
@@ -135,7 +135,7 @@
 
 2004-12-08 Wednesday 11:15  geiseri
 
-	Added a QVariant slot so C++ bindings can easier get more
+	Added a TQVariant slot so C++ bindings can easier get more
 	complex data types into the bindings.
 
 2004-12-08 Wednesday 11:12  geiseri
@@ -145,7 +145,7 @@
 
 2004-12-08 Wednesday 11:12  geiseri
 
-	Removed debug information that was screwing with QVariants.
+	Removed debug information that was screwing with TQVariants.
 
 2004-12-07 Tuesday 20:10  staikos
 
@@ -153,7 +153,7 @@
 
 2004-12-07 Tuesday 12:02  geiseri
 
-	do not delete a QWidget if you are painting on it, its rude
+	do not delete a TQWidget if you are painting on it, its rude
 
 2004-12-07 Tuesday 12:01  geiseri
 
@@ -165,10 +165,10 @@
 
 2004-12-06 Monday 14:07  geiseri
 
-	With new API QListViewItem objects now iterate properly.
+	With new API TQListViewItem objects now iterate properly.
 
-	QListView::firstChild() and QListView::currentSelection now work.
-	QListViewItems can now iterate property.
+	TQListView::firstChild() and TQListView::currentSelection now work.
+	TQListViewItems can now iterate property.
 
 	The test now shows how to use these methods.
 
@@ -186,7 +186,7 @@
 
 2004-12-05 Sunday 19:54  geiseri
 
-	Moved QListViewItem and QCheckListItem to the object registry.
+	Moved TQListViewItem and TQCheckListItem to the object registry.
 
 2004-12-05 Sunday 19:11  geiseri
 
@@ -200,7 +200,7 @@
 	JSFactory::registerOpaqueType("Name", new TypeFactory(parent,"name");
 
 	Now KJS can create your type and manipulate it.  This currently supports
-	only opaque types, QObject types are next once  this migration is
+	only opaque types, TQObject types are next once  this migration is
 	complete.
 
 2004-12-05 Sunday 19:08  geiseri
@@ -211,7 +211,7 @@
 
 2004-12-05 Sunday 10:12  geiseri
 
-	Test for QFrame
+	Test for TQFrame
 
 2004-12-04 Saturday 17:57  geiseri
 
@@ -219,7 +219,7 @@
 
 2004-12-04 Saturday 14:25  geiseri
 
-	Added QProgressDialog to the list of creatable types.
+	Added TQProgressDialog to the list of creatable types.
 
 2004-12-04 Saturday 02:34  geiseri
 
@@ -235,7 +235,7 @@
 
 2004-12-04 Saturday 01:33  geiseri
 
-	Add QToolBox items to the published children when comming from QWidgetFactory
+	Add TQToolBox items to the published children when comming from TQWidgetFactory
 
 2004-12-03 Friday 21:28  geiseri
 
@@ -267,7 +267,7 @@
 
 2004-12-03 Friday 20:05  geiseri
 
-	Do not delete QObjects that are managed by their parents.
+	Do not delete TQObjects that are managed by their parents.
 
 2004-12-03 Friday 20:04  geiseri
 
@@ -276,7 +276,7 @@
 
 2004-12-03 Friday 20:01  geiseri
 
-	Do not manage QListView, and ListBox items as the containers will.
+	Do not manage TQListView, and ListBox items as the containers will.
 	Had to wash this file over with AStyle, it was getting to be a mess.
 
 2004-12-02 Thursday 22:15  geiseri
@@ -285,12 +285,12 @@
 
 2004-12-02 Thursday 21:50  geiseri
 
-	Added QRect::contains(...) to Rect class.
+	Added TQRect::contains(...) to Rect class.
 	Updated game board to detect objects getting in the target.
 
 2004-12-01 Wednesday 14:45  geiseri
 
-	make 10 items, use QFrame for formatting.
+	make 10 items, use TQFrame for formatting.
 
 2004-12-01 Wednesday 11:25  geiseri
 
@@ -298,19 +298,19 @@
 
 2004-12-01 Wednesday 09:58  geiseri
 
-	Added tests for QSize, QPoint and QRect.
+	Added tests for TQSize, TQPoint and TQRect.
 
 2004-12-01 Wednesday 09:58  geiseri
 
 	Added support for:
-	QPoint
-	QRect
-	QSize
+	TQPoint
+	TQRect
+	TQSize
 
-	Cleanup headers in QPen
+	Cleanup headers in TQPen
 
 	These are all handled as value proxies so they are transparently supported
-	in slots, QObject bindings, and dcop.  These can be used by their variant
+	in slots, TQObject bindings, and dcop.  These can be used by their variant
 	names of Point, Rect and Size respectivly.  Also constructors are provided
 	for Point, Rect and Size so you can construct items in one step
 	ex:
@@ -346,7 +346,7 @@
 
 2004-11-30 Tuesday 10:45  geiseri
 
-	Added support for passing QStringList through slots.  This fixed the problems with KConfig bindings not showing up.  It should also fix the problem of not being able to pass StringLists to C++ slots that have been published to javascript.
+	Added support for passing TQStringList through slots.  This fixed the problems with KConfig bindings not showing up.  It should also fix the problem of not being able to pass StringLists to C++ slots that have been published to javascript.
 
 2004-11-29 Monday 17:41  annma
 
@@ -355,7 +355,7 @@
 
 2004-11-29 Monday 13:26  geiseri
 
-	Start of QSettings support for real.  Binding is complete hozed though so it probably needs to be replaced before we release the next release.
+	Start of TQSettings support for real.  Binding is complete hozed though so it probably needs to be replaced before we release the next release.
 
 2004-11-29 Monday 13:25  geiseri
 
@@ -375,7 +375,7 @@
 
 2004-11-28 Sunday 21:38  geiseri
 
-	removed default args, they really screw up QObject bindings.
+	removed default args, they really screw up TQObject bindings.
 
 2004-11-28 Sunday 21:32  geiseri
 
@@ -419,7 +419,7 @@
 
 2004-11-28 Sunday 20:12  geiseri
 
-	Vain attempt to fix the QCanvas bindings.  They are no longer crashing, but they are so not implemented they don't do much yet.
+	Vain attempt to fix the TQCanvas bindings.  They are no longer crashing, but they are so not implemented they don't do much yet.
 
 2004-11-28 Sunday 20:12  geiseri
 
@@ -428,12 +428,12 @@
 
 2004-11-28 Sunday 20:11  geiseri
 
-	QFrame now actually works as expected.
+	TQFrame now actually works as expected.
 
 2004-11-28 Sunday 20:10  geiseri
 
 	Remove dead code.
-	Fix stupid corner case where the QPainter would become invalid and crash kjsembed.
+	Fix stupid corner case where the TQPainter would become invalid and crash kjsembed.
 
 2004-11-28 Sunday 20:09  geiseri
 
@@ -449,7 +449,7 @@
 	Change this so the Config bindings handle all the dirty work.  This
 	removes a very strange misbehavior with the Config object when
 	used with scripts.
-	Started adding support for QSettings in Qt Only mode, but its disabled for now.
+	Started adding support for TQSettings in Qt Only mode, but its disabled for now.
 
 2004-11-28 Sunday 20:07  geiseri
 
@@ -459,7 +459,7 @@
 
 2004-11-28 Sunday 20:06  geiseri
 
-	QSplashScreen works again, the object was there but the bindings where not.
+	TQSplashScreen works again, the object was there but the bindings where not.
 	General code cleanup.
 	Made the factory throw some exceptions instead of just warnings.  This will
 	allow developers to actually be able to debug their scripts with a nondebug
@@ -510,8 +510,8 @@
 2004-11-24 Wednesday 01:59  staikos
 
 	QT_NO_COMPAT fix (untested, but at least it compiles now):
-	int match ( const QString & str, int index = 0, int * len = 0, bool indexIsStart = TRUE ) const  (obsolete)
-	int search ( const QString & str, int offset = 0, CaretMode caretMode = CaretAtZero ) const
+	int match ( const TQString & str, int index = 0, int * len = 0, bool indexIsStart = TRUE ) const  (obsolete)
+	int search ( const TQString & str, int offset = 0, CaretMode caretMode = CaretAtZero ) const
 
 2004-11-24 Wednesday 01:36  geiseri
 
@@ -550,12 +550,12 @@
 	internally.  Based heavily on boost::any but focuses on
 	pointers only.
 	3) Things to note now that KJS is actually managing
-	memory.  If you create a QObject binding but do not store
+	memory.  If you create a TQObject binding but do not store
 	it anywhere and let it go out of scope the GC WILL delete
 	it.  This may cause some unwanted side effects, so
 	please keep track of your objects.
 	4) Fixed some casting problems that was causing the
-	QCanvas bindings not to work.  They have not been completely
+	TQCanvas bindings not to work.  They have not been completely
 	solved yet but they are at least not crashing anymore.
 
 	There are still a few crashes, but these should be easier to
@@ -596,7 +596,7 @@
 	GC works on win32.
 	NOTE on win32: the standard in/out/err will crash if you do not have
 	matching Qt debug and KJSEmbed debug libs.  So if you have a nondebug
-	build of Qt NEVER build a debug version of QJSEmbed.  Gold star for
+	build of Qt NEVER build a debug version of TQJSEmbed.  Gold star for
 	MS on this one.
 
 2004-10-03 Sunday 23:25  zrusin
@@ -605,7 +605,7 @@
 
 2004-09-23 Thursday 15:51  mlaurent
 
-	CVS_SILENT QString(i18n(...)) -> i18n(...)
+	CVS_SILENT TQString(i18n(...)) -> i18n(...)
 
 2004-09-01 Wednesday 20:47  geiseri
 
@@ -710,11 +710,11 @@
 
 2004-08-16 Monday 08:46  geiseri
 
-	QWidget and QObject extraction helper functions.
+	TQWidget and TQObject extraction helper functions.
 
 2004-08-16 Monday 08:45  geiseri
 
-	QComboBox and QPopup menu fixes.
+	TQComboBox and TQPopup menu fixes.
 
 2004-07-14 Wednesday 04:31  binner
 
@@ -736,12 +736,12 @@
 
 	- Improvements to the bindingwizard.
 
-	- Start of bindings for QCanvasXX. These might need to be disabled for the
+	- Start of bindings for TQCanvasXX. These might need to be disabled for the
 	  3.3 release but they're a good stress test of the code.
 
 	- Update docs.
 
-	- Added support for QPoint to jsbinding methods.
+	- Added support for TQPoint to jsbinding methods.
 
 2004-06-18 Friday 19:44  rich
 
@@ -753,7 +753,7 @@
 
 2004-06-18 Friday 19:27  rich
 
-	- Added support for the QStringList parameter argument of the KParts
+	- Added support for the TQStringList parameter argument of the KParts
 	  constructors. For now, this can only be used with the full 5 argument
 	  forms of the factory's part construction methods. Added the test script
 	  from Koos, though it can't be used without an accompanying applet!
@@ -762,13 +762,13 @@
 2004-06-18 Friday 18:51  rich
 
 	- Updated the qtbindings using the bindwizard. The problems identified in
-	  #83427 and my own QListView testing turned out to be caused by a stupid
+	  #83427 and my own TQListView testing turned out to be caused by a stupid
 	  logic error in the code generated by the XSL. Basically, I forgot that
 	  enum values start at 0 even if they're being automagically generated.
 
 2004-06-18 Friday 17:34  rich
 
-	- Reverted the updated QComboBox bindings. Looks like I need to do some
+	- Reverted the updated TQComboBox bindings. Looks like I need to do some
 	  more work on making the XSL binding generator work with the custom
 	  bindings code.
 
@@ -791,11 +791,11 @@
 
 2004-06-12 Saturday 20:49  rich
 
-	- Reverted update of the QListViewItem bindings as it broke things.
+	- Reverted update of the TQListViewItem bindings as it broke things.
 
 2004-06-11 Friday 20:52  rich
 
-	- Handling for slots with signatures xx( const QTime &) and xx( QWidget *).
+	- Handling for slots with signatures xx( const TQTime &) and xx( TQWidget *).
 
 
 2004-06-11 Friday 19:03  rich
@@ -821,13 +821,13 @@
 
 2004-06-06 Sunday 20:40  rich
 
-	- Added support for QCheckListItem.
+	- Added support for TQCheckListItem.
 
 	- Regenerated qtbindings using the wizard.
 
 2004-06-06 Sunday 19:37  rich
 
-	- Added support for signals and slots with signature func(const QTime &)
+	- Added support for signals and slots with signature func(const TQTime &)
 	  including support for handling them from scripts.
 
 	- Added a check for exceptions occurring in event handlers.
@@ -908,8 +908,8 @@
 
 2004-05-28 Friday 19:15  rich
 
-	- Fixed the problem of the time property of a QTimeEdit returning -1. This
-	  in fact turned out to be a general problem that affects all QTime
+	- Fixed the problem of the time property of a TQTimeEdit returning -1. This
+	  in fact turned out to be a general problem that affects all TQTime
 	  properties and was happening because you can't create a Date object in js
 	  with just a time in it.
 
@@ -949,8 +949,8 @@
 
 2004-05-19 Wednesday 21:17  rich
 
-	- Added support for the selectedItem() method of QListView then converted the
-	  docviewer example to use QListView.
+	- Added support for the selectedItem() method of TQListView then converted the
+	  docviewer example to use TQListView.
 
 2004-05-19 Wednesday 20:10  rich
 
@@ -964,7 +964,7 @@
 
 2004-05-19 Wednesday 18:54  rich
 
-	- Fixed a couple of naming errors in QProcess's signals that resulted from
+	- Fixed a couple of naming errors in TQProcess's signals that resulted from
 	  the conversion from KProcess.
 
 2004-05-19 Wednesday 18:31  rich
@@ -1004,7 +1004,7 @@
 
 	Qt wants the real thing, not cheap immitations.
 
-	Fixed QPixmaps in slots.
+	Fixed TQPixmaps in slots.
 
 2004-05-07 Friday 17:13  geiseri
 
@@ -1020,10 +1020,10 @@
 
 	Const cleanups
 	Fixed accidental memory leak
-	Added the following methods to make access of QVariant based objects
+	Added the following methods to make access of TQVariant based objects
 	easier:
-	void putVariant( const QString &valueName, const QVariant &value);
-	QVariant getVariant( const QString &valueName ) const;
+	void putVariant( const TQString &valueName, const TQVariant &value);
+	TQVariant getVariant( const TQString &valueName ) const;
 
 	Started an implementation of a scope walker so the added methods
 	will work beyond the global scope.  Not reliable yet, so its not used.
@@ -1031,11 +1031,11 @@
 2004-05-05 Wednesday 22:26  geiseri
 
 	Added the following functions to the part for embedders to enjoy:
-	KJS::Value getValue( const QString &valueName );
-	KJS::Value callMethod(const QString &methodName, KJS::List &args);
-	void putValue( const QString &valueName, const KJS::Value &value);
+	KJS::Value getValue( const TQString &valueName );
+	KJS::Value callMethod(const TQString &methodName, KJS::List &args);
+	void putValue( const TQString &valueName, const KJS::Value &value);
 
-	Rich I have tests, but they require being compiled.  We need a C++ tests
+	Rich I have tests, but they retquire being compiled.  We need a C++ tests
 	directory at this point i think to show off what we are up to.
 
 2004-05-04 Tuesday 19:52  rich
@@ -1047,7 +1047,7 @@
 	- Improved the argument handling of kjscmd so that it will automatically
 	  invoke the console if there is no script to run. It will also call exec
 	  implicitly in this situation, though not if there is a script to invoke
-	  so the exec() call in the graphical scripts is still required.
+	  so the exec() call in the graphical scripts is still retquired.
 
 	- Added a directory for a standard library of javascript utilities and put
 	  the command line prompt script in it - other reusable scripts and objects
@@ -1075,15 +1075,15 @@
 
 2004-04-30 Friday 20:27  rich
 
-	- Extended the range of types supported by the XSL stylesheet to allow QFile
-	  and QFrame to be wrapped. Added the generated wrappers to the build.
+	- Extended the range of types supported by the XSL stylesheet to allow TQFile
+	  and TQFrame to be wrapped. Added the generated wrappers to the build.
 
 2004-04-30 Friday 19:36  rich
 
 	- Integrated the constructor bindings into the binding wizard and added a hack
 	  that only enables the first method we see with a given name, meaning that
 	  only the first version of overloaded methods can be used. This change means
-	  that the QComboBox binding is now generated directly from the Qt header file
+	  that the TQComboBox binding is now generated directly from the Qt header file
 	  using the wizard.
 
 2004-04-30 Friday 17:38  rich
@@ -1128,21 +1128,21 @@
 2004-04-23 Friday 18:47  geiseri
 
 	Added event support for:
-	QEvent::QTimer
-	QEvent::ContextMenu
-	QEvent::DragMove
-	QEvent::DragEnter
-	QEvent::Drop
-	QEvent::Enter
-	QEvent::Leave
-	QEvent::Clipboard
-	QEvent::DragLeave
+	TQEvent::TQTimer
+	TQEvent::ContextMenu
+	TQEvent::DragMove
+	TQEvent::DragEnter
+	TQEvent::Drop
+	TQEvent::Enter
+	TQEvent::Leave
+	TQEvent::Clipboard
+	TQEvent::DragLeave
 	Based all events off the default handler so interited
 	properties are preserved.
 
 2004-04-23 Friday 15:57  geiseri
 
-	move to QProcess.
+	move to TQProcess.
 
 2004-04-23 Friday 15:20  rich
 
@@ -1180,8 +1180,8 @@
 
 2004-04-22 Thursday 17:33  geiseri
 
-	Added extractQPalette
-	Added extractQStrList
+	Added extractTQPalette
+	Added extractTQStrList
 
 2004-04-22 Thursday 16:57  rich
 
@@ -1191,7 +1191,7 @@
 2004-04-22 Thursday 15:07  geiseri
 
 	Normalized the size and color extraction.
-	Added QRect helper function.
+	Added TQRect helper function.
 
 2004-04-22 Thursday 15:03  geiseri
 
@@ -1230,7 +1230,7 @@
 
 2004-04-21 Wednesday 16:09  geiseri
 
-	forgot to add the one i really wanted to.  Now we can map a string array to a QVariant properly.
+	forgot to add the one i really wanted to.  Now we can map a string array to a TQVariant properly.
 
 2004-04-21 Wednesday 15:48  geiseri
 
@@ -1241,7 +1241,7 @@
 
 2004-04-19 Monday 11:53  geiseri
 
-	fixed QBoxLayouts.  might want to backport
+	fixed TQBoxLayouts.  might want to backport
 
 2004-04-16 Friday 21:51  rich
 
@@ -1334,12 +1334,12 @@
 
 2004-04-12 Monday 10:00  geiseri
 
-	Added support for QProcess as a bindings plugin.
-	Exposed API identical to QProcess.
+	Added support for TQProcess as a bindings plugin.
+	Exposed API identical to TQProcess.
 
 2004-04-10 Saturday 20:40  rich
 
-	Added support for the setSpacing method of QHBox.
+	Added support for the setSpacing method of TQHBox.
 
 	Converted the docviewer example to use the KHTML streaming API and made it
 	work properly.
@@ -1362,11 +1362,11 @@
 	Added some methods that should allow us to have a unified interface to the
 	proxy types in future. This change is the first step towards an understanding
 	of inheritence. The first win of the change is that the code now understands
-	that KXMLGUIClient's are not necessarily QWidgets.
+	that KXMLGUIClient's are not necessarily TQWidgets.
 
 2004-04-09 Friday 17:52  rich
 
-	Added proper support for QComboBox. This binding was generated automagically
+	Added proper support for TQComboBox. This binding was generated automagically
 	using the xsl stuff in the tools dir, but I had to disable 4 methods to work
 	around missing support for method overloading. There's also an example.
 
@@ -1384,8 +1384,8 @@
 2004-04-08 Thursday 09:52  geiseri
 
 	Oh this is an annoying one.  For some reason I thought I could trust
-	QVariants to tell me what type they where.  It seems that in the
-	instance of QString vs QCString this is not the case, so I am now
+	TQVariants to tell me what type they where.  It seems that in the
+	instance of TQString vs TQCString this is not the case, so I am now
 	doing this correctly and using the dcop functions type signature to
 	get the correct types.  This fixes a few courious bugs I was chasing
 	after in dcop.  I am trying to backport this fix now.
@@ -1444,7 +1444,7 @@
 
 2004-02-29 Sunday 05:35  jowenn
 
-	It's not nice, for each proxy implementation one QGuardedPtr. :( I hope Qt's next generation smart pointer will be more lightweight. Why a qguardedptr?
+	It's not nice, for each proxy implementation one TQGuardedPtr. :( I hope Qt's next generation smart pointer will be more lightweight. Why a qguardedptr?
 
 	If you do the following in kjscmd it would crash without guardedptr
 	var k=new KMainWindow();
@@ -1466,11 +1466,11 @@
 2004-02-16 Monday 01:09  geiseri
 
 	Added signatures for:
-	    void slot_color( const QColor &color );
-	    void slot_point( const QPoint &point );
-	    void slot_rect( const QRect &rec );
-	    void slot_size( const QSize &size );
-	    void slot_pixmap( const QPixmap &pix );
+	    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 );
@@ -1618,7 +1618,7 @@
 
 2004-01-10 Saturday 19:25  rich
 
-	- Fixed support for QChildEvent. It now has a type specific conversion
+	- Fixed support for TQChildEvent. It now has a type specific conversion
 	  function rather than falling back to the generic one. Without this change,
 	  it is pretty useless as you can't access anything or even distinguish
 	  between insert and remove events.
@@ -1712,7 +1712,7 @@
 
 2003-12-31 Wednesday 11:54  geiseri
 
-	use new QPixmap code
+	use new TQPixmap code
 
 2003-12-31 Wednesday 11:12  geiseri
 
@@ -1735,7 +1735,7 @@
 
 2003-12-30 Tuesday 14:23  geiseri
 
-	move buttonmaker.js to new QPainter stuff
+	move buttonmaker.js to new TQPainter stuff
 
 2003-12-30 Tuesday 14:17  geiseri
 
@@ -1766,8 +1766,8 @@
 2003-12-30 Tuesday 10:56  geiseri
 
 	moved arg extraction code to slotutils
-	converted QPainter bindings to Opaque Proxy... it has issues still, but pending
-	QPixmaps conversion they cannot all be fixed yet.
+	converted TQPainter bindings to Opaque Proxy... it has issues still, but pending
+	TQPixmaps conversion they cannot all be fixed yet.
 	added arg extraction methods to simplify the code
 
 2003-12-29 Monday 16:08  rich
@@ -1776,13 +1776,13 @@
 
 2003-12-29 Monday 16:08  rich
 
-	- Added the binding for QListViewItem and the latest xsl templates.
+	- Added the binding for TQListViewItem and the latest xsl templates.
 
 2003-12-28 Sunday 21:22  rich
 
 	- Massive improvements to the binding generation tool. It can now create
 	  usable code!!! To prove this, I've added a new binding to the builtins
-	  directory for QDir. This binding was generated directly from the qdir.h
+	  directory for TQDir. This binding was generated directly from the qdir.h
 	  header file using the scripts in the tools directory. There is a simple test
 	  program in the test directory.
 
@@ -1851,7 +1851,7 @@
 
 	Added support for adding bindings via KParts Plugins.
 	I have tested ValueProxy and OpaqueProxy plugins and those work perfectly.
-	QObject based plugins are mostly working, but enums seem broken.
+	TQObject based plugins are mostly working, but enums seem broken.
 
 	The plugin interface is pretty thin right now, because I dont think we need
 	a heck of alot to bootstrap the process of adding a binding.
@@ -1889,7 +1889,7 @@
 
 	This might not be the right place for it, but we need a good way to get
 	the bounding boxes of text drawn on the painter with the current font
-	metrics.  Ideally we can move this later when we bind QFontMetrics?
+	metrics.  Ideally we can move this later when we bind TQFontMetrics?
 
 2003-12-17 Wednesday 23:37  geiseri
 
@@ -1907,7 +1907,7 @@
 
 2003-12-17 Wednesday 18:10  geiseri
 
-	Added ability to connect Qt signals to KJS Slots that have a single QFont or QColor.
+	Added ability to connect Qt signals to KJS Slots that have a single TQFont or TQColor.
 	Not as cool as I would have liked, but I guess its okay.
 
 2003-12-16 Tuesday 18:21  geiseri
@@ -1960,7 +1960,7 @@
 
 2003-12-15 Monday 19:40  rich
 
-	- Removed moc reference from ImageImp - it's not a QObject anymore.
+	- Removed moc reference from ImageImp - it's not a TQObject anymore.
 
 	- Fixed a crash when the factory is asked for an invalid part.
 
@@ -1969,7 +1969,7 @@
 	- Improved the code of the image binding:
 
 	  - Changed the name from Image to ImageImp as now that it doesn't use
-	    QObject, this class only handles the methods.
+	    TQObject, this class only handles the methods.
 
 	  - Added support for the enums from KImageEffect. The output of the test
 	    program should now be upside down.
@@ -1991,7 +1991,7 @@
 	Fixed the Image stuff so it will at least load.
 
 	Came to the conclusion that there is all wrong, and we should revert
-	back to the QObject bindings.  The current implimentation makes
+	back to the TQObject bindings.  The current implimentation makes
 	no sense for how the Image binding is suppose to operate.
 
 	Maby we really wanted a JSValueProxy?
@@ -2019,7 +2019,7 @@
 	- Started adding the framework needed to allow custom value types to become
 	  first class citizens.
 
-	- Replaced the NewQObject method of the factory with NewInstance which
+	- Replaced the NewTQObject method of the factory with NewInstance which
 	  supports the creation of instances of any type.
 
 	- Added support for event types to the opaque proxy.
@@ -2031,12 +2031,12 @@
 
 2003-12-12 Friday 23:56  geiseri
 
-	half of the move from QObject binding to JSProxyImp
+	half of the move from TQObject binding to JSProxyImp
 	rich this needs to be enabled, i was unsure of how to activate
 	it.
 
 	also am i correct in assuming that properties will no longer work for
-	Image now that we are using a non QObject binding?
+	Image now that we are using a non TQObject binding?
 
 2003-12-12 Friday 17:10  rich
 
@@ -2061,14 +2061,14 @@
 
 2003-12-12 Friday 15:18  rich
 
-	- Replaced the QObject wrapper for QTextStream with a native binding
+	- Replaced the TQObject wrapper for TQTextStream with a native binding
 	  class. This reduces the overhead of this binding, and allows more
 	  flexibility in the API we present to scripts.  The new binding provides the
 	  same API to scripts as the old one, except that the current() and
 	  setCurrent() methods have been removed as they are redundant.
 
 	  This binding is the first one to be based on the JSOpaqueProxy class, but
-	  this will in future be a common approach to wrapping non-QObject classes.
+	  this will in future be a common approach to wrapping non-TQObject classes.
 
 	- Made a few methods of the factory that were previously protected have
 	  private access. These methods are only useful internally, so there is no
@@ -2107,7 +2107,7 @@
 
 2003-12-08 Monday 17:53  rich
 
-	- Don't use -no-undefined as this now requires libkjsembed.
+	- Don't use -no-undefined as this now retquires libkjsembed.
 
 2003-12-08 Monday 17:16  rich
 
@@ -2243,8 +2243,8 @@
 
 2003-11-30 Sunday 23:31  geiseri
 
-	Added QStringList -> KJS Array support.
-	Added QPen -> Bindings::Pen support.
+	Added TQStringList -> KJS Array support.
+	Added TQPen -> Bindings::Pen support.
 
 2003-11-30 Sunday 23:30  geiseri
 
@@ -2263,7 +2263,7 @@
 
 2003-11-27 Thursday 21:05  rich
 
-	- Added some basic support for QScrollView illustrated by the imagetweak
+	- Added some basic support for TQScrollView illustrated by the imagetweak
 	  example, which will become more feature-full in future.
 
 	- Added the very incomplete beginning of support for generating bindings from
@@ -2289,21 +2289,21 @@
 	Rich im not sure if this is the correct location for these, but
 	they currently work.
 
-	Added a demo to show off the new dcop stuff, requires
+	Added a demo to show off the new dcop stuff, retquires
 	KWeatherService from tdetoys to be running, since i dont
 	know how to start a service from KJSEmbed yet.
 
 2003-11-22 Saturday 01:49  geiseri
 
-	Added variable length args to K/QListView.
+	Added variable length args to K/TQListView.
 	Added ability to handle Strings vs Pixmaps correctly.
-	Added native method for grabWidget on QWidget, this
+	Added native method for grabWidget on TQWidget, this
 	may get moved to Pixmap when i figure out how to handle
 	a widget pointer.
 
 2003-11-22 Saturday 00:54  geiseri
 
-	Make the compiler a little quieter by commenting out unused args in functions.
+	Make the compiler a little tquieter by commenting out unused args in functions.
 
 2003-11-21 Friday 20:13  rich
 
@@ -2323,7 +2323,7 @@
 	- Renamed the 'global' object to 'Global' for consistency with web browsers.
 
 	- Fixed some minor documentation error in the new builtin objects Ian added
-	  (they're not QObject wrappers!).
+	  (they're not TQObject wrappers!).
 
 	- Added basic support for loading files via the SAX api, a callback based
 	  mechanism for processing XML. The implementation is far from complete, but
@@ -2414,13 +2414,13 @@
 
 2003-11-16 Sunday 02:04  geiseri
 
-	hrmmm it seems that implantQVariant dosent work as i thought it should.  it seems once that is fixed things may
+	hrmmm it seems that implantTQVariant dosent work as i thought it should.  it seems once that is fixed things may
 	work a bit better.
 
 2003-11-16 Sunday 01:36  geiseri
 
-	Fixed the QPainter crash, it seems i had a booliean mistake
-	Added QVariant insertion support for DCOP... this still crashes, but gets further.
+	Fixed the TQPainter crash, it seems i had a booliean mistake
+	Added TQVariant insertion support for DCOP... this still crashes, but gets further.
 
 2003-11-14 Friday 22:48  rich
 
@@ -2431,11 +2431,11 @@
 	- Improved the type handling of the JSFactory class.
 
 	  - The mapping between typenames and proxy types now supports all the proxy
-	    types. This is essential if we are to support creation of non-QObject
+	    types. This is essential if we are to support creation of non-TQObject
 	    proxies properly.
 
 	  - Removed the 'special case' code that handled identification of classes
-	    supported by QWidgetFactory.
+	    supported by TQWidgetFactory.
 
 	  - You can now remove support for particular classes by calling addType() and
 	    specifying the proxy type TypeInvalid. I'm not sure how useful this is,
@@ -2453,11 +2453,11 @@
 	      list includes objects which can be wrapped but not created unlike the
 	      constructors method.
 
-	  - The methods now use QString rather than QCString to avoid needing lots of
+	  - The methods now use TQString rather than TQCString to avoid needing lots of
 	    charset conversions as these are an expensive operation.
 
 	  - Added a new method addObjectTypes() that is responsible for telling the
-	    factory about all the QObject types it knows about that do not have any
+	    factory about all the TQObject types it knows about that do not have any
 	    sort of custom bindings. The list of currently unsupported types was
 	    created by the scripts and data files in docs/examples/coverage/.
 
@@ -2488,7 +2488,7 @@
 	  - System.exit()       Exits with the status code 0
 	  - System.exit(Number)	     Exits with the status code specified.
 
-	- Added support for the QLayout classes QHBoxLayout and QVBoxLayout. In
+	- Added support for the TQLayout classes TQHBoxLayout and TQVBoxLayout. In
 	  addition to the slots and properties, the following custom bindings are
 	  available for box layouts:
 
@@ -2531,7 +2531,7 @@
 2003-11-10 Monday 23:09  geiseri
 
 	Fixed a few things, we can now attach, and call commands, but now im getting the same issue we
-	have in painter.  Things crash when reading a QString that has been passed in... not sure why
+	have in painter.  Things crash when reading a TQString that has been passed in... not sure why
 	rich you have ideas?
 
 2003-11-01 Saturday 11:34  rich
@@ -2552,20 +2552,20 @@
 
 2003-10-30 Thursday 19:29  rich
 
-	- Split the JSValueProxy into two in order to solve the problem that QObject
+	- Split the JSValueProxy into two in order to solve the problem that TQObject
 	  wrapper classes were broken by the increasing type-safety of the code.
 
 	  - JSValueProxy now handles variant proxies and nothing else.
 	  - JSOpaqueProxy takes over the handling of opaque pointer proxies.
 
 	- Fixed the slot return code to fall back to the opaque type if the return
-	  type is a pointer, but is not known by the factory as a QObject.
+	  type is a pointer, but is not known by the factory as a TQObject.
 
-	- convertToValue() now returns Undefined() for invalid QVariant values and
+	- convertToValue() now returns Undefined() for invalid TQVariant values and
 	  unsupported types. This prevents scripts incorrectly reporting that the
 	  method was successfull.
 
-	- NOTE: These changes have fixed the problems that were occuring with QObject
+	- NOTE: These changes have fixed the problems that were occuring with TQObject
 	  wrapper types.
 
 2003-10-30 Thursday 17:57  rich
@@ -2595,10 +2595,10 @@
 	  InternalFunctionImp (the internal here refers to the fact they are native
 	  code rather than JS). This change fixes the problem that scripts could not
 	  properly inspect the methods (for example instanceof was broken). The
-	  InternalFunctionImp constructor requires an ExecState, so a few incidental
-	  changes were required to accomodate this.
+	  InternalFunctionImp constructor retquires an ExecState, so a few incidental
+	  changes were retquired to accomodate this.
 
-	  NOTE: This change requires the patch to KJS that I just committed.
+	  NOTE: This change retquires the patch to KJS that I just committed.
 
 	- Added some missing d pointers.
 
@@ -2661,13 +2661,13 @@
 	  JSBuiltIn class which should simplify the factory (useful when we have
 	  multiple factories).
 
-	NOTE: Access to the QObject-based wrapper objects is broken at the
+	NOTE: Access to the TQObject-based wrapper objects is broken at the
 	moment. This is a known issue and is being addressed, but as things are being
 	restructured a bit fixing it will have to wait so I don't have to do it twice.
 
 2003-10-18 Saturday 19:43  rich
 
-	- Began adding support for non-QObject ptr types.
+	- Began adding support for non-TQObject ptr types.
 
 	- The part no longer inherits XMLActionRunner, instead there's an internal
 	  class that binds the two together. This makes the class hierarchy a lot
@@ -2676,19 +2676,19 @@
 	  further and the part should avoid automatically creating an XMLActionClient
 	  now that scripts can do this themselves.
 
-	- Made some of the methods of the factory object take 'const QString &' rather
-	  than 'QString'.
+	- Made some of the methods of the factory object take 'const TQString &' rather
+	  than 'TQString'.
 
 	- Reworked the handling of the JSFactory object. The factory is now a propery
 	  of the kpart rather than being global. This means that applications can have
-	  multiple active parts, each with their own factory. This change has required
+	  multiple active parts, each with their own factory. This change has retquired
 	  changes throughout KJSEmbed:
 
 	  - Changes to allow the static js objects to know which factory they should
 	    be using.
 
 	  - Changes to the proxies so they know which part they use rather than just
-	    which interpreter. This has required changes all over the place, but
+	    which interpreter. This has retquired changes all over the place, but
 	    better now than later.
 
 2003-10-18 Saturday 16:16  geiseri
@@ -2729,7 +2729,7 @@
 	- Moved builtins to a new directory. This isn't really needed yet, by doing it
 	  now we avoid lots of pain later.
 
-	- Improved support for QTimer.
+	- Improved support for TQTimer.
 
 	  - You now have access to the start(), stop() and isActive() methods.
 	  - Added an example that uses the new timer support.
@@ -2771,7 +2771,7 @@
 	    pass the value to the slot. Hopefully this will work for both
 	    JSObjectProxy values and for opaque values.
 
-	  - If the parameter type is supported by QVariant and the passed value is a
+	  - If the parameter type is supported by TQVariant and the passed value is a
 	    proxy we should now support that too.
 
 2003-10-11 Saturday 15:32  rich
@@ -2783,7 +2783,7 @@
 	    rest of the code a lot more readable.
 
 	- Added an implant method for proxy classes. This method will make it possible
-	  to pass QObjects, opaque values and unsupported variant types as parameters
+	  to pass TQObjects, opaque values and unsupported variant types as parameters
 	  to slots.
 
 2003-10-09 Thursday 21:14  rich
@@ -2798,12 +2798,12 @@
 	- Removed unused JSObjectProxyImp constructor.
 
 	- Lots of work on handling slots that return pointers. Slots that return types
-	  supported by QWidgetFactory now work, adding support for the other QObject
+	  supported by TQWidgetFactory now work, adding support for the other TQObject
 	  types will be pretty simple at this point. The code really needs to be a lot
-	  more generic - rather than asking the factory if the object is a QObject, it
+	  more generic - rather than asking the factory if the object is a TQObject, it
 	  should be asking the factory if there is a wrapper available for the class.
 
-	  - Did most of the grunt work required to handle slot pointer return types
+	  - Did most of the grunt work retquired to handle slot pointer return types
 	    properly. At the time we bind a slot we extract the return type from the
 	    metaobject, the classname we obtain is stored in the slot binding
 	    implementation.
@@ -2872,8 +2872,8 @@
 	  type. This means that rather than having to reference these values via the
 	  class instance, you can say things like:
 
-	  var f = new QFrame();
-	  f.frameShape = QFrame.WinPanel | QFrame.Sunken;
+	  var f = new TQFrame();
+	  f.frameShape = TQFrame.WinPanel | TQFrame.Sunken;
 
 	  It is important to note that with the current code, the enum values are not
 	  available until after the first instance of the specified type has been
@@ -2946,7 +2946,7 @@
 
 2003-09-16 Tuesday 01:26  geiseri
 
-	Added support for QMovie so we can spice up our boring GUIs...
+	Added support for TQMovie so we can spice up our boring GUIs...
 
 2003-09-15 Monday 22:52  geiseri
 
@@ -2970,7 +2970,7 @@
 
 2003-09-15 Monday 20:17  geiseri
 
-	Moved image_imp from a QImage * to a QImage value.
+	Moved image_imp from a TQImage * to a TQImage value.
 	Added image effect members to pixmap_imp
 	Added image effect members to image_imp
 
@@ -2983,7 +2983,7 @@
 	  constructors. These replace the dumpConstructors() function in
 	  jsbindings.h which has been now been removed.
 
-	    QStringList constructorNames() const;
+	    TQStringList constructorNames() const;
 	    KJS::Value constructors() const;
 	    KJS::List constructorList() const;
 
@@ -2997,8 +2997,8 @@
 2003-09-15 Monday 17:04  geiseri
 
 	Added support for the following events:
-		QKeyEvent, QWheelEvent, QFocusEvent, QPaintEvent, QMoveEvent
-		QResizeEvent, QCloseEvent, QShowEvent, QHideEvent, and QIMEvent.
+		TQKeyEvent, TQWheelEvent, TQFocusEvent, TQPaintEvent, TQMoveEvent
+		TQResizeEvent, TQCloseEvent, TQShowEvent, TQHideEvent, and TQIMEvent.
 
 	These need to be tested and it should be noted funcitons that return void, are not currently implemented.
 
@@ -3008,7 +3008,7 @@
 	- The events are now defined using an array, this makes it much easier
 	  to maintain and to add support for new event handlers.
 
-	- Added a binding to QApplication::exec(). If this works ok, I think I
+	- Added a binding to TQApplication::exec(). If this works ok, I think I
 	  should probably make no-exec mode the default and leave the decision
 	  entirely up to the script. This would mean I'd need to add a -exec
 	  option to allow you to use the console widget with non-graphical
@@ -3016,7 +3016,7 @@
 
 	- Various clean ups.
 
-	- Added support for the QObject className() method to the object
+	- Added support for the TQObject className() method to the object
 	  proxy, and an extra method superClassName() that queries the
 	  metaobject.
 
@@ -3032,7 +3032,7 @@
 
 2003-09-10 Wednesday 20:20  rich
 
-	- Added support for some more of the QMouseEvent class.
+	- Added support for some more of the TQMouseEvent class.
 	   state()
 	   stateAfter()
 	   globalX()
@@ -3077,7 +3077,7 @@
 	  handler is removed).
 
 	  In order to implement the scheme described, there needs to be a
-	  both a mapping between handler names and QEvent::Type, and a mapping
+	  both a mapping between handler names and TQEvent::Type, and a mapping
 	  between the type and the handler. The first is used to determine
 	  if assigning to a property should cause any event types to be
 	  forwarded (and which types they are), the second lets the event
@@ -3085,11 +3085,11 @@
 
 	  In addition to supporting the standard event handlers needed to
 	  write Qt/KDE wrappers, this code is intended to support weird
-	  compatibility stuff like kaxul. :-) This requirement means we need
+	  compatibility stuff like kaxul. :-) This retquirement means we need
 	  to allow for the possibility of custom event types, events mapping
 	  to custom handler names, and also custom signatures in event
 	  handlers. The same difficulties occur when support for custom
-	  QEvents is considered. This side of things is very much a work in
+	  TQEvents is considered. This side of things is very much a work in
 	  progress.
 
 	  At the moment both mappings are stored in the factory object, but
@@ -3105,7 +3105,7 @@
 
 	- Moved StdDialog binding code from the factory to the class itself.
 
-	- Added support for creating QScrollView and QCanvasView widgets.
+	- Added support for creating TQScrollView and TQCanvasView widgets.
 
 	- Added support for KMainWindow::createGUI().
 
@@ -3119,7 +3119,7 @@
 
 	- Added binding to isWidgetType().
 
-	- Added an example that generates a graphical tree of the QWidget
+	- Added an example that generates a graphical tree of the TQWidget
 	  hierarchy.
 
 	- Fixed const warning in convertToValue(). Various other irritating
@@ -3131,10 +3131,10 @@
 	  (this will be fixed). This means that for now you do things like
 	  this:
 
-	     f = new QFrame();
+	     f = new TQFrame();
 	     f.frameShape = f.Panel;
 
-	- Added a new demo 'frame' that illustrates QFrame and enum support.
+	- Added a new demo 'frame' that illustrates TQFrame and enum support.
 
 
 2003-08-27 Wednesday 14:30  geiseri
@@ -3198,7 +3198,7 @@
 2003-08-18 Monday 23:48  geiseri
 
 	Variable length slots now work for the currently known types.  Things seem
-	to pass the old tests, and some new dcop tests now pass.  QVariants still
+	to pass the old tests, and some new dcop tests now pass.  TQVariants still
 	need to be handled.  I leave for my flight in 17hours so im not optimistic
 	ill get in one more commit.  Rich please dont try to clean this up yet, as
 	ill probibly work on it before i get net access on thursday.
@@ -3217,8 +3217,8 @@
 
 	- Added a new example that illustrates support for KListView.
 
-	- JSValueProxy instances that contain a QVariant can now be converted
-	  back to QVariant.
+	- JSValueProxy instances that contain a TQVariant can now be converted
+	  back to TQVariant.
 
 	- Moved JSValueProxy out of the Bindings namespace.
 
@@ -3238,13 +3238,13 @@
 2003-08-17 Sunday 11:46  rich
 
 	- Added a new class JSValueProxy which provides an opaque binding to
-	  either a QVariant or a void pointer.
+	  either a TQVariant or a void pointer.
 
 	- Extended the property handling code to automatically generate opaque
 	  bindings for unknown types.
 
 	- Added a new method Factory.widgets() that returns a list of the
-	  widgets supported by QWidgetFactory.
+	  widgets supported by TQWidgetFactory.
 
 	- Added support for pointer slot return values.
 
@@ -3266,8 +3266,8 @@
 
 	- Added support for slot signatures needed by NetAccess:
 
-	  slot(const KURL&,const QString&)
-	  slot(const QString&,const KURL&)
+	  slot(const KURL&,const TQString&)
+	  slot(const TQString&,const KURL&)
 
 
 2003-08-16 Saturday 16:48  rich
@@ -3361,23 +3361,23 @@
 
 	- Added some more slot signatures:
 
-	  - slot(const QString &,uint)
-	  - slot(const QString &, bool)
-	  - slot(int,const QColor &)
+	  - slot(const TQString &,uint)
+	  - slot(const TQString &, bool)
+	  - slot(int,const TQColor &)
 	  - slot(int,int,int,int,int)
-	  - slot(const QPixmap&)
-	  - slot(const QRect&,bool)
-	  - slot(const QString&,bool)
-	  - slot(const QString&,bool,bool)
-	  - slot(const QString&,int,int)
-	  - slot(int,const QColor&,bool)
-	  - slot(int,const QColor&)
+	  - slot(const TQPixmap&)
+	  - slot(const TQRect&,bool)
+	  - slot(const TQString&,bool)
+	  - slot(const TQString&,bool,bool)
+	  - slot(const TQString&,int,int)
+	  - slot(int,const TQColor&,bool)
+	  - slot(int,const TQColor&)
 	  - slot(int,int,float,float)
-	  - slot(const QString&,bool,bool,bool)
+	  - slot(const TQString&,bool,bool,bool)
 
-	- Added a utility method for getting the QWidget in a proxy.
+	- Added a utility method for getting the TQWidget in a proxy.
 
-	- Added support for QPixmap properties.
+	- Added support for TQPixmap properties.
 
 	- Added imageviewer example.
 
@@ -3392,7 +3392,7 @@
 
 2003-08-14 Thursday 18:02  rich
 
-	- It helps if we actually make the QString,QString slots available to
+	- It helps if we actually make the TQString,TQString slots available to
 	  the JS interpreter...
 
 2003-08-14 Thursday 17:57  rich
@@ -3413,7 +3413,7 @@
 2003-08-13 Wednesday 15:58  zrusin
 
 	Adding bindings as a subdir dir. Fixing the non-working implicit cast of
-	QString to const char* to make it compile.
+	TQString to const char* to make it compile.
 	Rich are sure the bindings lib should be installable shared lib, and not
 	a static, non-installable one?
 
@@ -3428,7 +3428,7 @@
 
 2003-08-12 Tuesday 17:57  rich
 
-	- Moved the QObject classes that only exist to provide bindings into a
+	- Moved the TQObject classes that only exist to provide bindings into a
 	  new directory. This will hold all the classes that exist only to
 	  provide a binding.
 
@@ -3539,7 +3539,7 @@
 	- Added support for the slot signatures:
 
 	  - int,int,int,int,bool.
-	  - QRect, bool
+	  - TQRect, bool
 
 
 2003-07-26 Saturday 17:51  rich
@@ -3559,7 +3559,7 @@
 
 2003-07-26 Saturday 16:49  rich
 
-	- Added links to QSA and a tutorial on inheritence in JS.
+	- Added links to TQSA and a tutorial on inheritence in JS.
 
 2003-07-26 Saturday 16:35  rich
 
@@ -3573,11 +3573,11 @@
 
 	- Added constructors for the Painter object.
 
-	- Added a new binding Pixmap that provides an interface to QPixmap.
+	- Added a new binding Pixmap that provides an interface to TQPixmap.
 
 	- Removed duplication of the BindingObject construction code. The
 	  custom binding objects now use the same code as the classes defined
-	  by QWidgetFactory.
+	  by TQWidgetFactory.
 
 	- Removed test signals and slots from the kpart.
 
@@ -3589,7 +3589,7 @@
 
 	- Started adding support for custom methods:
 
-	  - jsobjectproxy.cpp	     Added insertItem method for QListBox
+	  - jsobjectproxy.cpp	     Added insertItem method for TQListBox
 	  - jsobjectproxy_imp.cpp
 	  - jsobjectproxy_imp.h
 
@@ -3618,11 +3618,11 @@
 	  cleaning up more before it is ready for prime time. The methods
 	  added are:
 
-	  QListBox::addItem()
+	  TQListBox::addItem()
 	  KListView::addColumn()
-	  QListView::addColumn()
+	  TQListView::addColumn()
 	  KListView::insertItem()
-	  QListView::insertItem()
+	  TQListView::insertItem()
 
 	- Started writing a new example that provides a documentation browser
 	  for KJSEmbed.
@@ -3632,11 +3632,11 @@
 
 	- Added constructors for the Painter object.
 
-	- Added a new binding Pixmap that provides an interface to QPixmap.
+	- Added a new binding Pixmap that provides an interface to TQPixmap.
 
 	- Removed duplication of the BindingObject construction code. The
 	  custom binding objects now use the same code as the classes defined
-	  by QWidgetFactory.
+	  by TQWidgetFactory.
 
 	- Removed test signals and slots from the kpart.
 
@@ -3665,10 +3665,10 @@
 
 	- Added support for getting the values of rect, size and point
 	  properties. The values are returned as arrays, the types are as
-	  follows: QRect -> [x,y,w,h], QSize -> [w,h], QPoint -> [x,y]
+	  follows: TQRect -> [x,y,w,h], TQSize -> [w,h], TQPoint -> [x,y]
 
 	- Changed the prototypes of a couple of methods that extract values so
-	  they take a KJS::ExecState parameter. This is required for us to
+	  they take a KJS::ExecState parameter. This is retquired for us to
 	  create arrays etc. in order to return complex values.
 
 	- Began renaming the KJS::ExecState variables to 'exec' rather than
@@ -3686,7 +3686,7 @@
 
 	- Improved slot publishing code so that overloaded slots are
 	  supported. The first slot is published as before, subsequent slots
-	  with the same name get the number of arguments they require
+	  with the same name get the number of arguments they retquire
 	  appended.
 
 	- Removed the childAt() and findChild() methods from the JSObjectProxy
@@ -3738,7 +3738,7 @@
 
 	- Added a couple more examples.
 
-	- Added support for creating QObject and QTimer.
+	- Added support for creating TQObject and TQTimer.
 
 	- Added some scripts to the docs directory that build a reference
 	  manual for the JS API. Added the results too.
@@ -3756,7 +3756,7 @@
 
 	- Support for connect
 
-	  - You can now connect a signal defined by one QObject, to a slot
+	  - You can now connect a signal defined by one TQObject, to a slot
 	    defined in another.
 
 	- Improved the dump function:
@@ -3821,21 +3821,21 @@
 	- Added utility methods for marshalling common types and used them to
 	  simplify the slot invocation code.
 
-	- Removed a bunch of extraneous QRegExps.
+	- Removed a bunch of extraneous TQRegExps.
 
 2003-06-16 Monday 20:10  rich
 
 	- Split the addition of bindings for object proxy.
 
-	- Added a stub class for QObject binding classes (the stub for native
+	- Added a stub class for TQObject binding classes (the stub for native
 	  bindings will arrive soon).
 
-	- Added support for QVariant return values.
+	- Added support for TQVariant return values.
 
 
 2003-06-16 Monday 11:36  staikos
 
-	handle QString returns properly
+	handle TQString returns properly
 	also be more debuggable
 
 2003-06-15 Sunday 22:14  rich
@@ -3847,7 +3847,7 @@
 
 	  - bool
 	  - int
-	  - QString
+	  - TQString
 	  - const char *
 
 	- Improved the self-documentation facilities.
@@ -3880,7 +3880,7 @@
 
 	  - Use KLineEdit and a KCompletion rather than a combo.
 	  - Added a prompt label with a keyboard accelerator.
-	  - QTextEdit -> KTextEdit.
+	  - TQTextEdit -> KTextEdit.
 	  - Pass the console widget the part rather than the interpreter.
 
 	- Provide access to the default execution context, and the ability to
@@ -3888,7 +3888,7 @@
 
 2003-06-09 Monday 03:51  staikos
 
-	Add support for QObjects that can self-bind JS methods.
+	Add support for TQObjects that can self-bind JS methods.
 	Rich: this is more or less just a demo.  It's not the ideal way for this to work
 	but I have not been able to find an alternative approach in JS or in C++.  We
 	might be stuck with it.  Please review.  We can back it out later if a better
@@ -3937,7 +3937,7 @@
 
 	- Fixed some problems with KJS::Identifier support.
 
-	- Added a very basic QPainter binding for drawing on QPixmaps. The following
+	- Added a very basic TQPainter binding for drawing on TQPixmaps. The following
 	  drawing operations are supported:
 
 	  - void moveTo( int x, int y );
@@ -3947,7 +3947,7 @@
 	  - void drawRect( int x, int y, int w, int h );
 	  - void drawRoundRect( int x, int y, int w, int h, int = 25, int = 25 );
 	  - void drawEllipse( int x, int y, int w, int h );
-	  - void drawText( int x, int y, const QString &txt );
+	  - void drawText( int x, int y, const TQString &txt );
 
 	- Fixed a problem with the --mainwin option.
 
@@ -3976,9 +3976,9 @@
 
 2003-02-04 Tuesday 17:50  rich
 
-	- Added support for more QWidgets:
+	- Added support for more TQWidgets:
 
-	  QSplitter, QMainWindow, QProgressDialog.
+	  TQSplitter, TQMainWindow, TQProgressDialog.
 
 	- Improved dump() function, now spits out a nice HTML table of the
 	  properties etc.
@@ -4004,7 +4004,7 @@
 	  consistency.
 
 	- Renamed publish() to addObject(), and publishStdBindings() to
-	  addStdBindings(). This is more consistent with QSA, and makes the
+	  addStdBindings(). This is more consistent with TQSA, and makes the
 	  API more familiar to developers familiar with the rest of KDE/Qt.
 
 2003-01-31 Friday 18:52  rich
@@ -4050,7 +4050,7 @@
 
 	- Moved Bind_Image and Bind_TextStream to their own files.
 
-	- Moved the KJS::Value <-> QVariant functions to jsbinding.
+	- Moved the KJS::Value <-> TQVariant functions to jsbinding.
 
 	- Improved the JSObjectProxy
 
@@ -4061,15 +4061,15 @@
 
 2003-01-14 Tuesday 15:56  rich
 
-	- Made QVariant <-> KJS::Value conversions standalone methods.
+	- Made TQVariant <-> KJS::Value conversions standalone methods.
 
 	- Made the argument ordering of the create() methods consistant
 	  throughout.
 
-	- Added accessor to allow you to get the QObject a proxy is bound to.
+	- Added accessor to allow you to get the TQObject a proxy is bound to.
 
 	- Now defines constructors for all the widgets supported by the
-	  QWidgetFactory. This change is very important as it eliminates what
+	  TQWidgetFactory. This change is very important as it eliminates what
 	  was the single most noticable difference between the C++ and
 	  Javascript objects. Using constructors properly has the added bonus
 	  that the Javascript interpreter can now correctly determine the
@@ -4077,18 +4077,18 @@
 
 	  - Supported Qt Widgets:
 
-	  QPushButton, QToolButton, QCheckBox, QRadioButton,
-	  QGroupBox, QButtonGroup, QIconView, QTable,
-	  QListBox, QListView, QLineEdit, QSpinBox,
-	  QMultiLineEdit, QLabel, TextLabel, PixmapLabel,
-	  QLayoutWidget, QTabWidget, QComboBox,
-	  QWidget, QDialog, QWizard, QLCDNumber,
-	  QProgressBar, QTextView, QTextBrowser,
-	  QDial, QSlider, QFrame, Line, QTextEdit,
-	  QDateEdit, QTimeEdit, QDateTimeEdit, QScrollBar,
-	  QPopupMenu, QWidgetStack, QMainWindow,
-	  QDataTable, QDataBrowser, QDataView,
-	  QVBox, QHBox, QGrid
+	  TQPushButton, TQToolButton, TQCheckBox, TQRadioButton,
+	  TQGroupBox, TQButtonGroup, TQIconView, TQTable,
+	  TQListBox, TQListView, TQLineEdit, TQSpinBox,
+	  TQMultiLineEdit, TQLabel, TextLabel, PixmapLabel,
+	  TQLayoutWidget, TQTabWidget, TQComboBox,
+	  TQWidget, TQDialog, TQWizard, TQLCDNumber,
+	  TQProgressBar, TQTextView, TQTextBrowser,
+	  TQDial, TQSlider, TQFrame, Line, TQTextEdit,
+	  TQDateEdit, TQTimeEdit, TQDateTimeEdit, TQScrollBar,
+	  TQPopupMenu, TQWidgetStack, TQMainWindow,
+	  TQDataTable, TQDataBrowser, TQDataView,
+	  TQVBox, TQHBox, TQGrid
 
 	  - Supported KDE Widgets:
 
@@ -4107,7 +4107,7 @@
 
 2003-01-11 Saturday 21:50  rich
 
-	- Added a binding to QImage::smoothScale(w,h,ScaleMin). This should
+	- Added a binding to TQImage::smoothScale(w,h,ScaleMin). This should
 	  really be handled by the enum property support, but as that doesn't
 	  exist yet we'll do it the hard way.
 
@@ -4141,7 +4141,7 @@
 
 	- Added Image binding.
 
-	  - Provides a binding to some basic QImage and QImageIO operations.
+	  - Provides a binding to some basic TQImage and TQImageIO operations.
 	  - Added example that prints info about an image.
 	  - Added an example that scales an image and writes it in a specified
 	  - format.
@@ -4186,7 +4186,7 @@
 
 	- Extended factory class to create the following types:
 
-	  - Any QWidget sub-class
+	  - Any TQWidget sub-class
 	  - KAction
 	  - KToggleAction
 
@@ -4238,6 +4238,6 @@
 
 2001-11-13 Tuesday 15:56  rich
 
-	A library for embedding kjs with transparent bindings to QObjects and
+	A library for embedding kjs with transparent bindings to TQObjects and
 	their properties, a dialog loader and a hook loader for client apps.
 
diff --git a/kjsembed/docs/TODO b/kjsembed/docs/TODO
index 06cfb0e4..38c3eafe 100644
--- a/kjsembed/docs/TODO
+++ b/kjsembed/docs/TODO
@@ -38,8 +38,8 @@ Bind Wizard
 ===========
 
 - Missing arg types:
-  - QColorGroup &
-  - QPainter *
+  - TQColorGroup &
+  - TQPainter *
 
 Bindings
 ========
@@ -49,9 +49,9 @@ Bindings
 - Move to the same pattern as the KJS/DOM bindings for better
   inheritence support.
 
-- Support for QSignal
+- Support for TQSignal
 
-- A generic wrapper for QStyle so you can write styles in JS.
+- A generic wrapper for TQStyle so you can write styles in JS.
 
 License Clarification
 =====================
diff --git a/kjsembed/docs/build-docs.js b/kjsembed/docs/build-docs.js
index 04f276c1..0758d4fc 100644
--- a/kjsembed/docs/build-docs.js
+++ b/kjsembed/docs/build-docs.js
@@ -175,9 +175,9 @@ document_statics( expts );
 generate_docs_object( 'TextStream', System.stdin );
 generate_docs_object( 'Application', application );
 generate_docs_object( 'KJSEmbedPart', part );
-generate_docs_object( 'QListViewItem', new QListViewItem(new QListView()) );
-generate_docs_object( 'QCheckListItem', new QCheckListItem(new QListView()) );
-generate_docs_object( 'QCanvasText', new QCanvasText(new QCanvas()) );
+generate_docs_object( 'TQListViewItem', new TQListViewItem(new TQListView()) );
+generate_docs_object( 'TQCheckListItem', new TQCheckListItem(new TQListView()) );
+generate_docs_object( 'TQCanvasText', new TQCanvasText(new TQCanvas()) );
 
 other.push( 'Application' );
 other.sort();
diff --git a/kjsembed/docs/build-docs.sh b/kjsembed/docs/build-docs.sh
index 815fead4..133dba91 100755
--- a/kjsembed/docs/build-docs.sh
+++ b/kjsembed/docs/build-docs.sh
@@ -23,29 +23,29 @@ $JS write_docs.js 'StdDirs' 'StdDirs' 'Provides access to KStandardDirs.' > $REF
 $JS write_docs.js 'StdIcons' 'StdIcons' 'Provides access to the KIconLoader.' > $REF/stdicons.html
 
 # Custom Objects
-$JS write_docs.js 'Image' 'new Image()' 'Bindings to the QImage class.' > $REF/image.html
-$JS write_docs.js 'Pixmap' 'new Pixmap()' 'Bindings to the QPixmap class.' > $REF/pixmap.html
+$JS write_docs.js 'Image' 'new Image()' 'Bindings to the TQImage class.' > $REF/image.html
+$JS write_docs.js 'Pixmap' 'new Pixmap()' 'Bindings to the TQPixmap class.' > $REF/pixmap.html
 $JS write_docs.js 'Painter' 'new Painter()' 'Bindings for painting on Pixmaps.' > $REF/painter.html
 $JS write_docs.js 'NetAccess' 'new NetAccess()' 'Bindings for KIO::NetAccess.' > $REF/netaccess.html
 $JS write_docs.js 'DCOPObject' 'new DCOPObject()' 'Provides support for DCOP.' > $REF/dcop.html
 $JS write_docs.js 'SqlDatabase' 'new SqlDatabase()' 'Provides support for QtSQL Databases.' > $REF/sqldatabase.html
 $JS write_docs.js 'SqlQuery' 'new SqlQuery()' 'Provides support for QtSQL Queries.' > $REF/sqlquery.html
-$JS write_docs.js 'TextStream' 'System.stdin' 'Bindings for QTextSteam.' > $REF/textstream.html
+$JS write_docs.js 'TextStream' 'System.stdin' 'Bindings for TQTextSteam.' > $REF/textstream.html
 $JS write_docs.js 'Config' 'new Config()' 'Bindings to the KConfig class.' > $REF/config.html
 
 # Qt Objects
-OBJECTS="QPushButton QToolButton QCheckBox QRadioButton"
-OBJECTS="$OBJECTS QGroupBox QButtonGroup QIconView QTable"
-OBJECTS="$OBJECTS QListBox QListView QLineEdit QSpinBox"
-OBJECTS="$OBJECTS QMultiLineEdit QLabel TextLabel PixmapLabel"
-OBJECTS="$OBJECTS QLayoutWidget QTabWidget QComboBox"
-OBJECTS="$OBJECTS QWidget QDialog QWizard QLCDNumber"
-OBJECTS="$OBJECTS QProgressBar QTextView QTextBrowser"
-OBJECTS="$OBJECTS QDial QSlider QFrame Line QTextEdit"
-OBJECTS="$OBJECTS QDateEdit QTimeEdit QDateTimeEdit QScrollBar"
-OBJECTS="$OBJECTS QPopupMenu QWidgetStack QMainWindow"
-OBJECTS="$OBJECTS QDataTable QDataBrowser QDataView"
-OBJECTS="$OBJECTS QVBox QHBox QGrid"
+OBJECTS="TQPushButton TQToolButton TQCheckBox TQRadioButton"
+OBJECTS="$OBJECTS TQGroupBox TQButtonGroup TQIconView TQTable"
+OBJECTS="$OBJECTS TQListBox TQListView TQLineEdit TQSpinBox"
+OBJECTS="$OBJECTS TQMultiLineEdit TQLabel TextLabel PixmapLabel"
+OBJECTS="$OBJECTS TQLayoutWidget TQTabWidget TQComboBox"
+OBJECTS="$OBJECTS TQWidget TQDialog TQWizard TQLCDNumber"
+OBJECTS="$OBJECTS TQProgressBar TQTextView TQTextBrowser"
+OBJECTS="$OBJECTS TQDial TQSlider TQFrame Line TQTextEdit"
+OBJECTS="$OBJECTS TQDateEdit TQTimeEdit TQDateTimeEdit TQScrollBar"
+OBJECTS="$OBJECTS TQPopupMenu TQWidgetStack TQMainWindow"
+OBJECTS="$OBJECTS TQDataTable TQDataBrowser TQDataView"
+OBJECTS="$OBJECTS TQVBox TQHBox TQGrid"
 
 for OBJ in $OBJECTS ;
 do
@@ -72,8 +72,8 @@ do
 done
 
 
-OBJECTS="$OBJECTS QSplitter"
-OBJECTS="$OBJECTS QObject QTimer"
+OBJECTS="$OBJECTS TQSplitter"
+OBJECTS="$OBJECTS TQObject TQTimer"
 
 OBJECTS="$OBJECTS KMainWindow KAction KToggleAction"
 
diff --git a/kjsembed/docs/embedding/qtembed/main.cpp b/kjsembed/docs/embedding/qtembed/main.cpp
index fbf8541b..78808aac 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 )
 {
-	TQApplication app( argc, argv );
+	TTQApplication app( argc, argv );
     POSViewImp *view = new POSViewImp;
     app.setMainWidget(view);
     view->show();
diff --git a/kjsembed/docs/embedding/qtembed/posviewbase.ui b/kjsembed/docs/embedding/qtembed/posviewbase.ui
index 9d8bad1a..4916d505 100755
--- a/kjsembed/docs/embedding/qtembed/posviewbase.ui
+++ b/kjsembed/docs/embedding/qtembed/posviewbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>POSViewBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>POSViewBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout3</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>appFrame</cstring>
                     </property>
@@ -49,7 +49,7 @@
                         <enum>Raised</enum>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>layout2</cstring>
                     </property>
@@ -57,7 +57,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -65,7 +65,7 @@
                                 <string>Recipt</string>
                             </property>
                         </widget>
-                        <widget class="QTextBrowser">
+                        <widget class="TQTextBrowser">
                             <property name="name">
                                 <cstring>recipt</cstring>
                             </property>
@@ -85,7 +85,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -99,7 +99,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -130,7 +130,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -147,7 +147,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
diff --git a/kjsembed/docs/embedding/qtembed/posviewimp.cpp b/kjsembed/docs/embedding/qtembed/posviewimp.cpp
index a9c3c289..118e471b 100644
--- a/kjsembed/docs/embedding/qtembed/posviewimp.cpp
+++ b/kjsembed/docs/embedding/qtembed/posviewimp.cpp
@@ -14,7 +14,7 @@
 #include <tqdatetime.h>
 #include <tqcolor.h>
 
-POSViewImp::POSViewImp(TQWidget *parent, const char *name)
+POSViewImp::POSViewImp(TTQWidget *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 764ac813..2bb0df9c 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( TQWidget *parent = 0, const char *name = 0 );
+    POSViewImp( TTQWidget *parent = 0, const char *name = 0 );
 
 public slots:
 	void loadScript();
diff --git a/kjsembed/docs/embedding/qtembed/test.js b/kjsembed/docs/embedding/qtembed/test.js
index 7a5c3bc0..f8e19742 100644
--- a/kjsembed/docs/embedding/qtembed/test.js
+++ b/kjsembed/docs/embedding/qtembed/test.js
@@ -1,3 +1,3 @@
-var vbox = new QVBoxLayout( appFrame );
+var vbox = new TQVBoxLayout( appFrame );
 var view = Factory.loadui("view.ui", appFrame, appFrame );
 view.show();
 \ No newline at end of file
diff --git a/kjsembed/docs/embedding/qtembed/view.ui b/kjsembed/docs/embedding/qtembed/view.ui
index c714ff00..2f3eaa01 100755
--- a/kjsembed/docs/embedding/qtembed/view.ui
+++ b/kjsembed/docs/embedding/qtembed/view.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>view</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>view</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout1</cstring>
             </property>
@@ -24,17 +24,17 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>mSKU</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="1">
+                <widget class="TQLineEdit" row="2" column="1">
                     <property name="name">
                         <cstring>mPrice</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -42,7 +42,7 @@
                         <string>SKU:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -50,7 +50,7 @@
                         <string>Price:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -58,7 +58,7 @@
                         <string>Product:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <property name="name">
                         <cstring>mProduct</cstring>
                     </property>
@@ -68,7 +68,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>mImage</cstring>
             </property>
diff --git a/kjsembed/docs/embedding/simple-embed/README b/kjsembed/docs/embedding/simple-embed/README
index f04a5635..9f4bbff5 100644
--- a/kjsembed/docs/embedding/simple-embed/README
+++ b/kjsembed/docs/embedding/simple-embed/README
@@ -1,5 +1,5 @@
 -----------------------------------------------
-Kde application framework template quickstart
+Kde application framework template tquickstart
 Author: Thomas Nagy
 Date: 2004-03-22
 -----------------------------------------------
diff --git a/kjsembed/docs/embedding/simple-embed/demo.html b/kjsembed/docs/embedding/simple-embed/demo.html
index 085d47bf..f5c46b63 100644
--- a/kjsembed/docs/embedding/simple-embed/demo.html
+++ b/kjsembed/docs/embedding/simple-embed/demo.html
@@ -69,8 +69,8 @@ who want to write scripts.
   <li><b><a href="conventions.html">Document Conventions</a></b><br>
   Explains the typographical conventions used by the documents.</li>
 
-  <li><b><a href="kjsembed-qsa.html">KJSEmbed and QSA</a></b><br>
-  Discusses the differences between KJSEmbed and QSA.</li>
+  <li><b><a href="kjsembed-qsa.html">KJSEmbed and TQSA</a></b><br>
+  Discusses the differences between KJSEmbed and TQSA.</li>
 </ul>
 
 <h3>References</h3>
@@ -83,7 +83,7 @@ who want to write scripts.
   A tutorial on how to implement inheritence in JavaScript.
   </li>
   <li><b><a href="http://doc.trolltech.com/qsa/">Qt Script for Applications Documentation</a></b><br>
-  The documentation for QSA, this is Trolltech's ECMAScript binding
+  The documentation for TQSA, this is Trolltech's ECMAScript binding
   for Qt.
   </li>
 </ul>
diff --git a/kjsembed/docs/embedding/simple-embed/embedview.ui b/kjsembed/docs/embedding/simple-embed/embedview.ui
index 43be65ab..44985f72 100644
--- a/kjsembed/docs/embedding/simple-embed/embedview.ui
+++ b/kjsembed/docs/embedding/simple-embed/embedview.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>EmbedView</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout1</cstring>
             </property>
@@ -24,7 +24,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -42,7 +42,7 @@
                         <cstring>m_name</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -50,7 +50,7 @@
                         <string>Department:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -65,7 +65,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>m_customOptions</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <string>Custom Options</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout3</cstring>
             </property>
diff --git a/kjsembed/docs/embedding/simple-embed/embedviewimp.cpp b/kjsembed/docs/embedding/simple-embed/embedviewimp.cpp
index b71521d5..87ae4f00 100644
--- a/kjsembed/docs/embedding/simple-embed/embedviewimp.cpp
+++ b/kjsembed/docs/embedding/simple-embed/embedviewimp.cpp
@@ -15,7 +15,7 @@
 #include <tqdatetime.h>
 #include <tqcolor.h>
 
-EmbedViewImp::EmbedViewImp(TQWidget *parent, const char *name)
+EmbedViewImp::EmbedViewImp(TTQWidget *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);
-    TQMap<TQString, TQVariant> personalData = KJSEmbed::convertToVariant(m_part->globalExec(), val).toMap();
-    TQDate birthday = personalData["birthday"].toDate();
-    TQColor eyecolor = personalData["eyeColor"].toColor();
-    TQString notes = personalData["notes"].toString();
+    TTQMap<TTQString, TTQVariant> personalData = KJSEmbed::convertToVariant(m_part->globalExec(), val).toMap();
+    TTQDate birthday = personalData["birthday"].toDate();
+    TTQColor eyecolor = personalData["eyeColor"].toColor();
+    TTQString 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 TQString &file )
+bool EmbedViewImp::runScript( const TTQString &file )
 {
     return m_part->runFile(file, m_part->globalObject() );
 }
 
-TQVariant EmbedViewImp::someValue() const
+TTQVariant EmbedViewImp::someValue() const
 {
-    TQMap<TQString,TQVariant> returnMap;
+    TTQMap<TTQString,TTQVariant> returnMap;
     returnMap["name"] = m_name->text();	
     returnMap["title"] = m_title->text();	
     returnMap["dept"] = m_dept->text();	
-    return TQVariant(returnMap);
+    return TTQVariant(returnMap);
 }
 
-void EmbedViewImp::setSomeValue( const TQVariant &val )
+void EmbedViewImp::setSomeValue( const TTQVariant &val )
 {
-    TQMap<TQString,TQVariant> map = val.toMap();
+    TTQMap<TTQString,TTQVariant> 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 7c678a32..5003c182 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( TQWidget *parent = 0, const char *name = 0 );
+    EmbedViewImp( TTQWidget *parent = 0, const char *name = 0 );
 
-    bool runScript( const TQString &file );
+    bool runScript( const TTQString &file );
 
 public slots:
     virtual void cancelClicked();
     virtual void okClicked();
     virtual void consoleClicked();
 
-    TQVariant someValue() const;
-    void setSomeValue( const TQVariant &var );
+    TTQVariant someValue() const;
+    void setSomeValue( const TTQVariant &var );
 private:
     KJSEmbed::KJSEmbedPart *m_part;
 };
diff --git a/kjsembed/docs/embedding/simple-embed/hi32-app-embedjs.png b/kjsembed/docs/embedding/simple-embed/hi32-app-embedjs.png
index 45ae1a11..a8c927b0 100644
--- a/kjsembed/docs/embedding/simple-embed/hi32-app-embedjs.png
+++ b/kjsembed/docs/embedding/simple-embed/hi32-app-embedjs.png
diff --git a/kjsembed/docs/embedding/simple-embed/test.js b/kjsembed/docs/embedding/simple-embed/test.js
index 2511a465..f954b26a 100644
--- a/kjsembed/docs/embedding/simple-embed/test.js
+++ b/kjsembed/docs/embedding/simple-embed/test.js
@@ -3,18 +3,18 @@
 CustomOptions.orientation = Qt.Vertical;
 CustomOptions.columns = 1;
 
-var box = new QVBox(CustomOptions);
-var row1 = new QHBox(box);
-var dateLabel = new QLabel(row1);
+var box = new TQVBox(CustomOptions);
+var row1 = new TQHBox(box);
+var dateLabel = new TQLabel(row1);
 dateLabel.text = "Birthday:";
 var birthday = new KDateWidget(row1);
 
-var row2 = new QHBox(box);
-var eyeLabel = new QLabel(row2);
+var row2 = new TQHBox(box);
+var eyeLabel = new TQLabel(row2);
 eyeLabel.text = "Eye color:";
 var eyeColor = new KColorButton(row2);
 
-var row3 = new QHBox(box);
+var row3 = new TQHBox(box);
 var notes = new KTextEdit(row3);
 
 box.show();
diff --git a/kjsembed/docs/examples/README b/kjsembed/docs/examples/README
index db1e2e37..71449ae3 100644
--- a/kjsembed/docs/examples/README
+++ b/kjsembed/docs/examples/README
@@ -40,14 +40,14 @@ This section contains examples that illustrate particular KJSEmbed facilities.
 customwidget       Creates a simple form directly from Javascript.             
 treeview           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 QObject DOM API.                            
+qobject-dom        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 QPixmap values.                      
+imageviewer        Illustrates the use of TQPixmap values.                      
 netaccess          Illustrates the bindings to KIO::NetAccess.                 
 listview           Creates a simple KListView.                                 
-frame              Shows off QFrame support and the use of enums.              
-timer              Creates a flashing LED using QTimer.                        
+frame              Shows off TQFrame support and the use of enums.              
+timer              Creates a flashing LED using TQTimer.                        
 Actions            A simple KAction demo.                                      
 Built-In Messages  Demonstrates the built-in message dialogs.                  
 Image Tweak        Tweaking images.                                            
@@ -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.                                     
-QComboBox          A simple demo of QComboBox.                                 
+TTQComboBox          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/buttonmaker/ButtonMakerUI.ui b/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui
index 23c30593..60339d6a 100644
--- a/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui
+++ b/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Form1</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -24,7 +24,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>PreviewBox</cstring>
             </property>
@@ -43,7 +43,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>Preview</cstring>
                     </property>
@@ -56,7 +56,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout6</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -82,7 +82,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>Mode</cstring>
             </property>
@@ -93,7 +93,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>layout15</cstring>
                     </property>
@@ -101,7 +101,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout8</cstring>
                             </property>
@@ -109,7 +109,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>Srcimg</cstring>
                                     </property>
@@ -127,7 +127,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout14</cstring>
                             </property>
@@ -152,7 +152,7 @@
                                         </size>
                                     </property>
                                 </spacer>
-                                <widget class="QLayoutWidget">
+                                <widget class="TQLayoutWidget">
                                     <property name="name">
                                         <cstring>layout13</cstring>
                                     </property>
@@ -160,7 +160,7 @@
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>textLabel3_2</cstring>
                                             </property>
@@ -178,7 +178,7 @@
                                         </widget>
                                     </hbox>
                                 </widget>
-                                <widget class="QLayoutWidget">
+                                <widget class="TQLayoutWidget">
                                     <property name="name">
                                         <cstring>layout12</cstring>
                                     </property>
@@ -186,7 +186,7 @@
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>textLabel4_2</cstring>
                                             </property>
@@ -208,7 +208,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>layout17</cstring>
                     </property>
@@ -216,7 +216,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>Pillbox</cstring>
                             </property>
@@ -241,7 +241,7 @@
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout9</cstring>
                             </property>
@@ -249,7 +249,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel2</cstring>
                                     </property>
@@ -273,7 +273,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout10</cstring>
                             </property>
@@ -281,7 +281,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel1_2</cstring>
                                     </property>
@@ -322,7 +322,7 @@
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout15</cstring>
                             </property>
@@ -330,7 +330,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel1_3</cstring>
                                     </property>
@@ -362,7 +362,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>TextBox</cstring>
             </property>
@@ -373,7 +373,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -392,7 +392,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>layout16</cstring>
                     </property>
@@ -400,7 +400,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel2_2</cstring>
                             </property>
@@ -413,7 +413,7 @@
                                 <cstring>XOffset</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel2_2_2</cstring>
                             </property>
@@ -445,7 +445,7 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>layout10</cstring>
                     </property>
@@ -453,7 +453,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout7</cstring>
                             </property>
@@ -461,7 +461,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel4</cstring>
                                     </property>
@@ -496,7 +496,7 @@
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout8</cstring>
                             </property>
@@ -504,7 +504,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel5</cstring>
                                     </property>
diff --git a/kjsembed/docs/examples/buttonmaker/buttonmaker.js b/kjsembed/docs/examples/buttonmaker/buttonmaker.js
index ac85b878..8cb82ba3 100755
--- a/kjsembed/docs/examples/buttonmaker/buttonmaker.js
+++ b/kjsembed/docs/examples/buttonmaker/buttonmaker.js
@@ -24,20 +24,20 @@ win.connect( saveAction, 'activated()', this, 'saveImage');
 win.connect( newAction, 'activated()', this, 'resetView');
 
 
-win.connect(view.TextBox.Font, 'fontSelected(const QFont&)', this, 'updateUI' );
-win.connect(view.TextBox.TextColors, 'fgChanged(const QColor&)', this, 'updateUI' );
-win.connect(view.TextBox.TextColors, 'bgChanged(const QColor&)', this, 'updateUI' );
+win.connect(view.TextBox.Font, 'fontSelected(const TQFont&)', this, 'updateUI' );
+win.connect(view.TextBox.TextColors, 'fgChanged(const TQColor&)', this, 'updateUI' );
+win.connect(view.TextBox.TextColors, 'bgChanged(const TQColor&)', this, 'updateUI' );
 win.connect(view.TextBox.Offset, 'valueChanged(int)', this, 'updateUI' );
 win.connect(view.TextBox.YOffset, 'valueChanged(int)', this, 'updateUI' );
 win.connect(view.TextBox.XOffset, 'valueChanged(int)', this, 'updateUI' );
 
-win.connect(view.Text, 'returnPressed(const QString&)', this, 'updateUI');
+win.connect(view.Text, 'returnPressed(const TQString&)', this, 'updateUI');
 
 win.connect(view.Mode, 'released(int)', this, 'changeMode');
 win.connect(view.Mode.Xsize, 'valueChanged(int)', this, 'updatePillBox' );
 win.connect(view.Mode.Ysize, 'valueChanged(int)', this, 'updatePillBox' );
-win.connect(view.Mode.BaseColor, 'changed(const QColor&)', this, 'updatePillBox' );
-win.connect(view.Mode.BaseImage, 'urlSelected(const QString&)', this, 'loadImage');
+win.connect(view.Mode.BaseColor, 'changed(const TQColor&)', this, 'updatePillBox' );
+win.connect(view.Mode.BaseImage, 'urlSelected(const TQString&)', this, 'loadImage');
 
 win.connect(view.Mode.Xscale, 'valueChanged(int)', this, 'updateUI' );
 win.connect(view.Mode.Yscale, 'valueChanged(int)', this, 'updateUI' );
diff --git a/kjsembed/docs/examples/buttonmaker/pillbox.js b/kjsembed/docs/examples/buttonmaker/pillbox.js
index 25c50ae1..21621c19 100755
--- a/kjsembed/docs/examples/buttonmaker/pillbox.js
+++ b/kjsembed/docs/examples/buttonmaker/pillbox.js
@@ -61,35 +61,35 @@ function BaseImage()
 	}
 
 	this.test = function( parent ) {
-		var box = new QHBox(parent);
-		var vbox1 = new QVBox(box);
-		var vbox2 = new QVBox(box);
-		var vbox3 = new QVBox(box);
-		var l1 = new QLabel(vbox1);
+		var box = new TQHBox(parent);
+		var vbox1 = new TQVBox(box);
+		var vbox2 = new TQVBox(box);
+		var vbox3 = new TQVBox(box);
+		var l1 = new TQLabel(vbox1);
 		l1.pixmap = this.a.pixmap();
 
-		var l2 = new QLabel(vbox1);
+		var l2 = new TQLabel(vbox1);
 		l2.pixmap = this.d.pixmap();
 
-		var l3 = new QLabel(vbox1);
+		var l3 = new TQLabel(vbox1);
 		l3.pixmap = this.g.pixmap();
 
-		var l4 = new QLabel(vbox2);
+		var l4 = new TQLabel(vbox2);
 		l4.pixmap = this.b.pixmap();
 
-		var l5 = new QLabel(vbox2);
+		var l5 = new TQLabel(vbox2);
 		l5.pixmap = this.e.pixmap();
 
-		var l6 = new QLabel(vbox2);
+		var l6 = new TQLabel(vbox2);
 		l6.pixmap = this.h.pixmap();
 
-		var l7 = new QLabel(vbox3);
+		var l7 = new TQLabel(vbox3);
 		l7.pixmap = this.c.pixmap();
 
-		var l8 = new QLabel(vbox3);
+		var l8 = new TQLabel(vbox3);
 		l8.pixmap = this.f.pixmap();
 
-		var l9 = new QLabel(vbox3);
+		var l9 = new TQLabel(vbox3);
 		l9.pixmap = this.i.pixmap();
 	}
 
@@ -138,7 +138,7 @@ function BaseImage()
 
 
 var base = new BaseImage();
-var label = new QLabel(this);
+var label = new TQLabel(this);
 
 
 if ( !base.loadImages() )
@@ -150,8 +150,8 @@ var W = 128;
 
 base.resize(W,H);
 
-var box = new QHBox(this);
-var label = new QLabel(box);
+var box = new TQHBox(this);
+var label = new TQLabel(box);
 label.resize(W,H);
 label.paintEvent = function(ev)
 {
@@ -159,7 +159,7 @@ label.paintEvent = function(ev)
 	base.widget(label);
 }
 
-var label2 = new QLabel(box);
+var label2 = new TQLabel(box);
 label2.pixmap = base.pixmap(W,H);
 
 base.test(box);
diff --git a/kjsembed/docs/examples/calc/calc.ui b/kjsembed/docs/examples/calc/calc.ui
index 773ea848..85fb6afc 100644
--- a/kjsembed/docs/examples/calc/calc.ui
+++ b/kjsembed/docs/examples/calc/calc.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>calc</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>calc</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLCDNumber">
+        <widget class="TQLCDNumber">
             <property name="name">
                 <cstring>display</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <number>18</number>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout2</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton" row="1" column="3">
+                <widget class="TQPushButton" row="1" column="3">
                     <property name="name">
                         <cstring>plus</cstring>
                     </property>
@@ -43,7 +43,7 @@
                         <string>+</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="4">
+                <widget class="TQPushButton" row="0" column="4">
                     <property name="name">
                         <cstring>all_clear</cstring>
                     </property>
@@ -51,7 +51,7 @@
                         <string>AC</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="3">
+                <widget class="TQPushButton" row="2" column="3">
                     <property name="name">
                         <cstring>minus</cstring>
                     </property>
@@ -59,7 +59,7 @@
                         <string>-</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="3" column="2" rowspan="1" colspan="2">
+                <widget class="TQPushButton" row="3" column="2" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>equals</cstring>
                     </property>
@@ -67,7 +67,7 @@
                         <string>=</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="4">
+                <widget class="TQPushButton" row="1" column="4">
                     <property name="name">
                         <cstring>clear</cstring>
                     </property>
@@ -75,7 +75,7 @@
                         <string>CL</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="3" column="1">
+                <widget class="TQPushButton" row="3" column="1">
                     <property name="name">
                         <cstring>zero</cstring>
                     </property>
@@ -83,7 +83,7 @@
                         <string>0</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="0">
+                <widget class="TQPushButton" row="1" column="0">
                     <property name="name">
                         <cstring>four</cstring>
                     </property>
@@ -91,7 +91,7 @@
                         <string>4</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="1">
+                <widget class="TQPushButton" row="0" column="1">
                     <property name="name">
                         <cstring>two</cstring>
                     </property>
@@ -99,7 +99,7 @@
                         <string>2</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>five</cstring>
                     </property>
@@ -107,7 +107,7 @@
                         <string>5</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="2">
+                <widget class="TQPushButton" row="0" column="2">
                     <property name="name">
                         <cstring>three</cstring>
                     </property>
@@ -115,7 +115,7 @@
                         <string>3</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="0">
+                <widget class="TQPushButton" row="2" column="0">
                     <property name="name">
                         <cstring>seven</cstring>
                     </property>
@@ -123,7 +123,7 @@
                         <string>7</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="2">
+                <widget class="TQPushButton" row="1" column="2">
                     <property name="name">
                         <cstring>six</cstring>
                     </property>
@@ -131,7 +131,7 @@
                         <string>6</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="1">
+                <widget class="TQPushButton" row="2" column="1">
                     <property name="name">
                         <cstring>eight</cstring>
                     </property>
@@ -139,7 +139,7 @@
                         <string>8</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="2">
+                <widget class="TQPushButton" row="2" column="2">
                     <property name="name">
                         <cstring>nine</cstring>
                     </property>
@@ -147,7 +147,7 @@
                         <string>9</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="0">
+                <widget class="TQPushButton" row="0" column="0">
                     <property name="name">
                         <cstring>one</cstring>
                     </property>
diff --git a/kjsembed/docs/examples/combobox/combo.js b/kjsembed/docs/examples/combobox/combo.js
index 3ac40491..88f94df7 100644
--- a/kjsembed/docs/examples/combobox/combo.js
+++ b/kjsembed/docs/examples/combobox/combo.js
@@ -1,13 +1,13 @@
 #!/usr/bin/env kjscmd
 
-// Example that uses QComboBox
+// Example that uses TQComboBox
 
-var hbox = new QHBox();
+var hbox = new TQHBox();
 
-var l = new QLabel( hbox );
+var l = new TQLabel( hbox );
 l.text = 'Combo test';
 
-var cb = new QComboBox( hbox );
+var cb = new TQComboBox( hbox );
 cb.insertItem( 'test 1' );
 cb.insertItem( 'test 2' );
 cb.insertItem( 'test 3' );
diff --git a/kjsembed/docs/examples/connect-cpp/connect-cpp.js b/kjsembed/docs/examples/connect-cpp/connect-cpp.js
index c79d1dea..2eab8db8 100644
--- a/kjsembed/docs/examples/connect-cpp/connect-cpp.js
+++ b/kjsembed/docs/examples/connect-cpp/connect-cpp.js
@@ -2,10 +2,10 @@
 
 function item( parent )
 {
-    var hbox = new QHBox( parent  );
+    var hbox = new TQHBox( parent  );
 
     var led = new KLed( hbox );
-    var btn = new QCheckBox( hbox );
+    var btn = new TQCheckBox( hbox );
     btn.checked = true;
     btn.text = 'Toggle LED';
 
@@ -18,17 +18,17 @@ function item( parent )
     led.connect( btn, 'toggled(bool)', 'toggle()' );
 }
 
-var vbox = new QVBox( 'test' );
+var vbox = new TQVBox( 'test' );
 vbox.margin = 6;
 vbox.spacing = 4;
 
-var ttl = new QLabel( vbox );
+var ttl = new TQLabel( vbox );
 ttl.text = '<h1>Connections</h1>';
 
 for ( var i = 0 ; i < 10 ; i++ )
     item( vbox );
 
-var quit = new QPushButton( vbox );
+var quit = new TQPushButton( vbox );
 quit.text = '&Quit';
 vbox.connect( quit, 'clicked()', 'close()' );
 
diff --git a/kjsembed/docs/examples/connect/connect.js b/kjsembed/docs/examples/connect/connect.js
index aa56a366..28cec189 100644
--- a/kjsembed/docs/examples/connect/connect.js
+++ b/kjsembed/docs/examples/connect/connect.js
@@ -38,7 +38,7 @@ var de = top.child('d');
 top.connect( ve, 'clicked()', obj, 'func_void' );
 top.connect( be, 'toggled(bool)', obj, 'func_bool' );
 top.connect( ie, 'valueChanged(int)', obj, 'func_int' );
-top.connect( se, 'textChanged(const QString&)', obj, 'func_string' );
+top.connect( se, 'textChanged(const TQString&)', obj, 'func_string' );
 top.connect( de, 'valueChanged(double)', obj, 'func_double' );
 
 top.show();
diff --git a/kjsembed/docs/examples/connect/connect.ui b/kjsembed/docs/examples/connect/connect.ui
index 5b172a8d..5c33501e 100644
--- a/kjsembed/docs/examples/connect/connect.ui
+++ b/kjsembed/docs/examples/connect/connect.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>demo</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>demo</cstring>
     </property>
@@ -24,7 +24,7 @@
                 <cstring>s</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="2">
+        <widget class="TQLabel" row="0" column="2">
             <property name="name">
                 <cstring>textLabel2_2</cstring>
             </property>
@@ -50,12 +50,12 @@
                 <cstring>d</cstring>
             </property>
         </widget>
-        <widget class="QSpinBox" row="4" column="1">
+        <widget class="TQSpinBox" row="4" column="1">
             <property name="name">
                 <cstring>i</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -79,7 +79,7 @@
                 <set>AlignCenter</set>
             </property>
         </widget>
-        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>b</cstring>
             </property>
@@ -87,7 +87,7 @@
                 <string>Bool</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQPushButton" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>v</cstring>
             </property>
@@ -95,7 +95,7 @@
                 <string>Void</string>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>textLabel3</cstring>
             </property>
@@ -103,7 +103,7 @@
                 <string>Double:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -111,7 +111,7 @@
                 <string>Int:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
diff --git a/kjsembed/docs/examples/customwidget/custom_widget.js b/kjsembed/docs/examples/customwidget/custom_widget.js
index dbab2d8f..c9df7f29 100755
--- a/kjsembed/docs/examples/customwidget/custom_widget.js
+++ b/kjsembed/docs/examples/customwidget/custom_widget.js
@@ -6,25 +6,25 @@
 
 function createField( parent )
 {
-    var hbox = new QHBox( box, 'hb' );
+    var hbox = new TQHBox( box, 'hb' );
 
-    var label = new QLabel( hbox );
+    var label = new TQLabel( hbox );
     label.text = 'Filename:';
-    var ed = new QLineEdit( hbox, 'lineed' );
+    var ed = new TQLineEdit( hbox, 'lineed' );
     ed.text = './my_file.txt';
-    var pb = new QPushButton( hbox, 'button' );
+    var pb = new TQPushButton( hbox, 'button' );
     pb.text = 'Br&owse';
     var led = new KLed( hbox, 'led' );
 }
 
 function createGroup( parent )
 {
-    var grp = new QGroupBox( box, 'grp' );
+    var grp = new TQGroupBox( box, 'grp' );
     grp.columns = 1;
-    grp.title = 'A QGroupBox';
+    grp.title = 'A TQGroupBox';
 	
-    var cb1 = new QCheckBox( grp, 'check1' );
-    var cb2 = new QCheckBox( grp, 'check2' );
+    var cb1 = new TQCheckBox( grp, 'check1' );
+    var cb2 = new TQCheckBox( grp, 'check2' );
     cb1.text = 'Check Box One';
     cb2.text = 'Check Box Two';
 
@@ -32,20 +32,20 @@ function createGroup( parent )
 }
 
 // Outer layout
-var box = new QVBox();
+var box = new TQVBox();
 box.margin = 6;
 
 // Title
-var ttl = new QLabel( box, 'title' );
+var ttl = new TQLabel( box, 'title' );
 ttl.text = '<qt><center><h3>KJSEmbed Object Creation Demo</h3></center><hr></qt>';
 
 // Named field
 createField( box );
 
 // Text editor
-var l = new QLabel( box, 'tl' );
+var l = new TQLabel( box, 'tl' );
 l.txt = 'Editable Text Widget:';
-var txt = new QTextEdit( box, 'text_edit' );
+var txt = new TQTextEdit( box, 'text_edit' );
 txt.text = '<qt>This is an editable text widget created from <i>Javascript</i> using the '
          + '<b>KJSEmbed</b> library. As you can see, the facilities are powerful enough '
          + 'for many useful applications to be found.</qt>';
diff --git a/kjsembed/docs/examples/dcop/interface.js b/kjsembed/docs/examples/dcop/interface.js
index ed699768..8e8fad0b 100755
--- a/kjsembed/docs/examples/dcop/interface.js
+++ b/kjsembed/docs/examples/dcop/interface.js
@@ -11,7 +11,7 @@ function anotherInterface( bar )
 }
 
 var dcop = new DCOPInterface(this, "someInterface");
-dcop.publish("void someInterface(QString)");
-dcop.publish("QString anotherInterface(QString)");
+dcop.publish("void someInterface(TQString)");
+dcop.publish("TQString anotherInterface(TQString)");
 
 application.exec();
diff --git a/kjsembed/docs/examples/dcop/rss.js b/kjsembed/docs/examples/dcop/rss.js
index c1eb3882..7ec9f2eb 100755
--- a/kjsembed/docs/examples/dcop/rss.js
+++ b/kjsembed/docs/examples/dcop/rss.js
@@ -3,9 +3,9 @@
 function newArticles( articles )
 {
 
-	var box = new QVBox(main);
+	var box = new TQVBox(main);
 	var count = articles.call("count()");
-	var label = new QLabel(box);
+	var label = new TQLabel(box);
 	var list = new KListBox(box);
 
 
@@ -19,7 +19,7 @@ function newArticles( articles )
 	return true;
 }
 
-var main = new QHBox(this)
+var main = new TQHBox(this)
 var dcop = new DCOPInterface(this, "news");
 dcop.publish("void newArticles(DCOPRef)");
 
@@ -28,7 +28,7 @@ var feeds = client.call( "rssservice", "RSSService", "list()" );
 
 for( var idx = 0; idx < feeds.length; ++idx)
 {
-	var doc = client.call( "rssservice", "RSSService", "add(QString)", feeds[idx] );
+	var doc = client.call( "rssservice", "RSSService", "add(TQString)", feeds[idx] );
 	client.connectDCOPSignal("rssservice", doc.obj(), "documentUpdated(DCOPRef)",
 			"news","newArticles(DCOPRef)");
 	doc.call("refresh()");
diff --git a/kjsembed/docs/examples/dcop/signalslot.js b/kjsembed/docs/examples/dcop/signalslot.js
index 884faa29..6774854c 100755
--- a/kjsembed/docs/examples/dcop/signalslot.js
+++ b/kjsembed/docs/examples/dcop/signalslot.js
@@ -2,9 +2,9 @@
 
 function newWeather( station )
 {
-	var temp = client.call("KWeatherService", "WeatherService", "temperature(QString)", "KMKE");
-	var name = client.call("KWeatherService", "WeatherService", "stationName(QString)", "KMKE");
-	var label = new QLabel(this);
+	var temp = client.call("KWeatherService", "WeatherService", "temperature(TQString)", "KMKE");
+	var name = client.call("KWeatherService", "WeatherService", "stationName(TQString)", "KMKE");
+	var label = new TQLabel(this);
 	label.text = "The temperature at " + name + " is " + temp;
 	label.show();
 }
@@ -13,13 +13,13 @@ var client = new DCOPClient(this);
 if ( client.attach() )
 {
 	var dcop = new DCOPInterface(this, "weather");
-	dcop.publish("void newWeather(QString)");
+	dcop.publish("void newWeather(TQString)");
 
-	client.connectDCOPSignal("KWeatherService", "WeatherService", "fileUpdate(QString)",
-		 "weather","newWeather(QString)");
+	client.connectDCOPSignal("KWeatherService", "WeatherService", "fileUpdate(TQString)",
+		 "weather","newWeather(TQString)");
 
 
-	client.send("KWeatherService", "WeatherService", "update(QString)", "KMKE");
+	client.send("KWeatherService", "WeatherService", "update(TQString)", "KMKE");
 
 	application.exec();
 }
diff --git a/kjsembed/docs/examples/dcop/weather.js b/kjsembed/docs/examples/dcop/weather.js
index 8d8a59c3..00c16e0e 100755
--- a/kjsembed/docs/examples/dcop/weather.js
+++ b/kjsembed/docs/examples/dcop/weather.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env kjscmd
 
 var dcop = new DCOPClient(this);
-var box = new QHBox(this);
+var box = new TQHBox(this);
 var go = new KPushButton(box);
 var loc = new KLineEdit(box);
 
@@ -16,7 +16,7 @@ function getWeather()
 	if ( dcop.isAttached() )
 	{
 		var icn = new Image(this);
-		icn.pixmap = dcop.call("KWeatherService","WeatherService","icon(QString)", loc.text);
+		icn.pixmap = dcop.call("KWeatherService","WeatherService","icon(TQString)", loc.text);
 		icn.smoothScale(32,32);
 		go.pixmap = icn.pixmap;
 	}
diff --git a/kjsembed/docs/examples/docviewer/docviewer.js b/kjsembed/docs/examples/docviewer/docviewer.js
index 3fed8a78..d03c0a15 100644
--- a/kjsembed/docs/examples/docviewer/docviewer.js
+++ b/kjsembed/docs/examples/docviewer/docviewer.js
@@ -32,11 +32,11 @@ function setup_sidebar( builtins, special, qt, kde, all )
 var mw = new KMainWindow(this);
 var ac = mw.actionCollection();
 
-var split = new QSplitter( mw );
+var split = new TQSplitter( mw );
 mw.setCentralWidget( split );
 
-side = new QToolBox( split, 'sidebar' );
-view = new QTabWidget( split, 'mainview' );
+side = new TQToolBox( split, 'sidebar' );
+view = new TQTabWidget( split, 'mainview' );
 
 // Load the view
 jsview = Factory.createROPart( "text/html", view, "js" );
diff --git a/kjsembed/docs/examples/docviewer/docviewer.ui b/kjsembed/docs/examples/docviewer/docviewer.ui
index 0cdb1930..3ccf0d02 100644
--- a/kjsembed/docs/examples/docviewer/docviewer.ui
+++ b/kjsembed/docs/examples/docviewer/docviewer.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>doc_viewer</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>doc_viewer</cstring>
     </property>
@@ -27,7 +27,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <cstring>search_edit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
diff --git a/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui b/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui
index 2e8658b3..c9830b55 100644
--- a/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui
+++ b/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>Form1</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1_2</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>layout14_2</cstring>
                     </property>
@@ -43,7 +43,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget" row="0" column="1">
+                        <widget class="TQLayoutWidget" row="0" column="1">
                             <property name="name">
                                 <cstring>layout11_2</cstring>
                             </property>
@@ -83,7 +83,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>textLabel1_4_2</cstring>
                             </property>
@@ -91,7 +91,7 @@
                                 <string>City/state, zipcode:</string>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget" row="1" column="1">
+                        <widget class="TQLayoutWidget" row="1" column="1">
                             <property name="name">
                                 <cstring>layout10_2</cstring>
                             </property>
@@ -131,7 +131,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>textLabel1_3</cstring>
                             </property>
@@ -139,7 +139,7 @@
                                 <string>Name:</string>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget" row="2" column="1">
+                        <widget class="TQLayoutWidget" row="2" column="1">
                             <property name="name">
                                 <cstring>layout9_2</cstring>
                             </property>
@@ -179,7 +179,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget" row="3" column="1">
+                        <widget class="TQLayoutWidget" row="3" column="1">
                             <property name="name">
                                 <cstring>layout8_2</cstring>
                             </property>
@@ -219,7 +219,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>textLabel1_2_2_2</cstring>
                             </property>
@@ -227,7 +227,7 @@
                                 <string>Address line 2:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>textLabel1_2_3</cstring>
                             </property>
@@ -239,7 +239,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -258,7 +258,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>layout14</cstring>
                     </property>
@@ -266,7 +266,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget" row="0" column="1">
+                        <widget class="TQLayoutWidget" row="0" column="1">
                             <property name="name">
                                 <cstring>layout11</cstring>
                             </property>
@@ -306,7 +306,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>textLabel1_4</cstring>
                             </property>
@@ -314,7 +314,7 @@
                                 <string>City/state, zipcode:</string>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget" row="1" column="1">
+                        <widget class="TQLayoutWidget" row="1" column="1">
                             <property name="name">
                                 <cstring>layout10</cstring>
                             </property>
@@ -354,7 +354,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -362,7 +362,7 @@
                                 <string>Name:</string>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget" row="2" column="1">
+                        <widget class="TQLayoutWidget" row="2" column="1">
                             <property name="name">
                                 <cstring>layout9</cstring>
                             </property>
@@ -402,7 +402,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget" row="3" column="1">
+                        <widget class="TQLayoutWidget" row="3" column="1">
                             <property name="name">
                                 <cstring>layout8</cstring>
                             </property>
@@ -442,7 +442,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>textLabel1_2_2</cstring>
                             </property>
@@ -450,7 +450,7 @@
                                 <string>Address line 2:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>textLabel1_2</cstring>
                             </property>
@@ -477,7 +477,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>barcode</cstring>
                     </property>
@@ -492,7 +492,7 @@
                 <cstring>font</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout12</cstring>
             </property>
diff --git a/kjsembed/docs/examples/envelopemaker/env.js b/kjsembed/docs/examples/envelopemaker/env.js
index 4d26c295..8e71a6ca 100755
--- a/kjsembed/docs/examples/envelopemaker/env.js
+++ b/kjsembed/docs/examples/envelopemaker/env.js
@@ -61,7 +61,7 @@ function print()
 			if( view.child('barcode').checked )
 				ps += env.barcode();
 			ps += env.footer();
-			if ( !dcop.send("kprinterservice", "printer", "printStream(const QString&)", ps ) )
+			if ( !dcop.send("kprinterservice", "printer", "printStream(const TQString&)", ps ) )
 			{
 				alert("There was an error talking to the KPrinterService, please check that it is running.");
 			}
diff --git a/kjsembed/docs/examples/eventhandling/jsboard.js b/kjsembed/docs/examples/eventhandling/jsboard.js
index 91e9a0f2..03dc01e3 100644
--- a/kjsembed/docs/examples/eventhandling/jsboard.js
+++ b/kjsembed/docs/examples/eventhandling/jsboard.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env kjscmd
 
 // Globals
-var frame = new QFrame(this);
+var frame = new TQFrame(this);
 var labels = new Array();
 var startPos = new Point(0,0);
 var lastPos = new Point(0,0);
@@ -23,7 +23,7 @@ function Target( parent, text)
   var w = 100;
   var h = 100;
 
-  this.label = new QLabel(parent);
+  this.label = new TQLabel(parent);
   this.text = text;
   this.label.paletteBackgroundColor = "green";
   this.label.geometry = new Rect(x,y,w,h);
@@ -37,15 +37,15 @@ function Target( parent, text)
 
 function Block(parent,text)
 {
-    this.label = new QLabel(parent);
+    this.label = new TQLabel(parent);
     var x = Math.floor( Math.random() * parent.width );
     var y = Math.floor( Math.random() * parent.height );
     var w = 25;
     var h = 25;
     this.label.text = text;
     this.label.geometry = new Rect(x,y,w,h);
-    this.label.frameShape = QFrame.WinPanel;
-    this.label.frameShadow = QFrame.Plain;
+    this.label.frameShape = TQFrame.WinPanel;
+    this.label.frameShadow = TQFrame.Plain;
     this.label.paletteBackgroundColor = "white";  
     this.label.setMouseTracking(true);
     this.label.adjustSize();
diff --git a/kjsembed/docs/examples/eventhandling/mousetrack.js b/kjsembed/docs/examples/eventhandling/mousetrack.js
index 9c970c42..0bf427c8 100644
--- a/kjsembed/docs/examples/eventhandling/mousetrack.js
+++ b/kjsembed/docs/examples/eventhandling/mousetrack.js
@@ -5,7 +5,7 @@
 //
 
 
-var mousetrack = new QWidget(this);
+var mousetrack = new TQWidget(this);
 mousetrack.setMouseTracking(true);
 x=0;
 y=0;
diff --git a/kjsembed/docs/examples/eventhandling/scribble.js b/kjsembed/docs/examples/eventhandling/scribble.js
index 0ffcdb07..95fafe7c 100644
--- a/kjsembed/docs/examples/eventhandling/scribble.js
+++ b/kjsembed/docs/examples/eventhandling/scribble.js
@@ -5,7 +5,7 @@
 //
 
 
-var scribble = new QWidget(this);
+var scribble = new TQWidget(this);
 scribble.line=false;
 var x=0;
 var y=0;
diff --git a/kjsembed/docs/examples/frame/frame.js b/kjsembed/docs/examples/frame/frame.js
index d19fc4de..b14be202 100644
--- a/kjsembed/docs/examples/frame/frame.js
+++ b/kjsembed/docs/examples/frame/frame.js
@@ -1,26 +1,26 @@
 #!/usr/bin/env kjscmd
 
-// Demo of QFrame and enum support
+// Demo of TQFrame and enum support
 
 function add_frame( parent )
 {
-  var v = new QVBox( parent );
+  var v = new TQVBox( parent );
   v.margin = 6;
 
-  return new QFrame( v );
+  return new TQFrame( v );
 }
 
-var top = new QVBox();
-var hbox = new QHBox( top );
+var top = new TQVBox();
+var hbox = new TQHBox( top );
 
 var f = add_frame( hbox );
-f.frameShape = QFrame.Box;
+f.frameShape = TQFrame.Box;
 
 f = add_frame( hbox );
-f.frameShape = QFrame.WinPanel | QFrame.Sunken;
+f.frameShape = TQFrame.WinPanel | TQFrame.Sunken;
 
 f = add_frame( hbox );
-f.frameShape = QFrame.PopupPanel;
+f.frameShape = TQFrame.PopupPanel;
 
 top.resize(300,200);
 
diff --git a/kjsembed/docs/examples/grepdialog/README b/kjsembed/docs/examples/grepdialog/README
index e126113f..931d6544 100644
--- a/kjsembed/docs/examples/grepdialog/README
+++ b/kjsembed/docs/examples/grepdialog/README
@@ -2,5 +2,5 @@ Illustrates a number of useful facilities:
 
 - Creating dialogs from .ui files.
 - Reading files from stdin and parsing them with JS regexps.
-- Displaying formatted text using QML.
+- Displaying formatted text using TQML.
 - Using shell scripts with kjscmd.
diff --git a/kjsembed/docs/examples/grepdialog/grepdlg.ui b/kjsembed/docs/examples/grepdialog/grepdlg.ui
index 53a169bd..2bf823c2 100644
--- a/kjsembed/docs/examples/grepdialog/grepdlg.ui
+++ b/kjsembed/docs/examples/grepdialog/grepdlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>GrepDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>GrepDialog</cstring>
     </property>
@@ -28,7 +28,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLineEdit" row="2" column="1">
+        <widget class="TQLineEdit" row="2" column="1">
             <property name="name">
                 <cstring>search_edit</cstring>
             </property>
@@ -36,7 +36,7 @@
                 <string>KJSEmbed</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -47,7 +47,7 @@
                 <cstring>search_edit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -58,7 +58,7 @@
                 <cstring>files_edit</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="3" column="1">
+        <widget class="TQLineEdit" row="3" column="1">
             <property name="name">
                 <cstring>files_edit</cstring>
             </property>
@@ -83,7 +83,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QCheckBox" row="5" column="1">
+        <widget class="TQCheckBox" row="5" column="1">
             <property name="name">
                 <cstring>case_check</cstring>
             </property>
@@ -91,7 +91,7 @@
                 <string>Match &amp;case</string>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>TextLabel3_2</cstring>
             </property>
@@ -99,7 +99,7 @@
                 <string>Options:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -127,7 +127,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QCheckBox" row="6" column="1">
+        <widget class="TQCheckBox" row="6" column="1">
             <property name="name">
                 <cstring>shownumbers_check</cstring>
             </property>
@@ -138,7 +138,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -169,7 +169,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
diff --git a/kjsembed/docs/examples/grepdialog/grepresults.ui b/kjsembed/docs/examples/grepdialog/grepresults.ui
index 4bec43f4..fd575ea5 100644
--- a/kjsembed/docs/examples/grepdialog/grepresults.ui
+++ b/kjsembed/docs/examples/grepdialog/grepresults.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>GrepResults</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>GrepResults</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -47,7 +47,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QTextEdit">
+        <widget class="TQTextEdit">
             <property name="name">
                 <cstring>results_text</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -101,7 +101,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
diff --git a/kjsembed/docs/examples/html2text/test.htm b/kjsembed/docs/examples/html2text/test.htm
index 2a060c2d..af257805 100644
--- a/kjsembed/docs/examples/html2text/test.htm
+++ b/kjsembed/docs/examples/html2text/test.htm
@@ -38,7 +38,7 @@ pre {
   been designed with this in mind thanks to a KParts plugin. In addition, KJSEmbed 
   provides a command line tool for running scripts so users can easily create 
   simple applications of their own in Javascript. KJSEmbed scripts are surprisingly 
-  powerful because they access the properties and slots of QObjects, and can even 
+  powerful because they access the properties and slots of TQObjects, and can even 
   load widgets and dialogs created with Qt's graphical dialog editor.&lt;/p>
 &lt;h3>Features&lt;/h3>
 &lt;p>To give you an idea of what KJSEmbed provides, here is a brief summary of the 
@@ -50,16 +50,16 @@ pre {
   &lt;li>Command line tool for running scripts (this can even operate without an 
     X server if you don't need to display a GUI).&lt;/li>
   &lt;li>Define new KActions using XML.&lt;/li>
-  &lt;li>Scripts can access the properties and slots of QObjects as if they were 
+  &lt;li>Scripts can access the properties and slots of TQObjects as if they were 
     normal Javascript properties and methods.&lt;/li>
   &lt;li>Scripts can load dialogs and widgets created with Qt Designer.&lt;/li>
-  &lt;li>Scripts can create instances of anu TQWidget subclass supported by TQWidgetFactory.&lt;/li>
-  &lt;li>Making your own QObjects/QWidgets available for scripting is one-liner.&lt;/li>
+  &lt;li>Scripts can create instances of anu TTQWidget subclass supported by TTQWidgetFactory.&lt;/li>
+  &lt;li>Making your own TQObjects/TQWidgets available for scripting is one-liner.&lt;/li>
   &lt;li>Scripts can traverse the widget tree, so your entire application can be 
     made scriptable without explicitly binding every object.&lt;/li>
 &lt;/ul>
 &lt;h3>First Steps - The Console Dialog&lt;/h3>
-&lt;p>The quickest way to see what KJSEmbed can do is with kjscmd, a tool for running 
+&lt;p>The tquickest way to see what KJSEmbed can do is with kjscmd, a tool for running 
   scripts from the command line. To begin, we'll run kjscmd without any parameters 
   which brings up the KJSEmbed console dialog. The console provides an easy way 
   to run short (one line) scripts, as you can see in figure 1 the scripts have 
@@ -87,11 +87,11 @@ JSConsoleWidget (KJSEmbed::JSConsoleWidget)
 kjs> console.childCount()
 4
 kjs> console.childAt(1)
-CmdEdit (TQComboBox)
+CmdEdit (TTQComboBox)
 kjs> console.childAt(2)
-RunButton (TQPushButton)
+RunButton (TTQPushButton)
 kjs> console.child(&amp;quot;RunButton&amp;quot;)
-RunButton (TQPushButton)
+RunButton (TTQPushButton)
 kjs> console.child(&amp;quot;RunButton&amp;quot;).text = &amp;quot;Go!&amp;quot;
 Go!
 kjs> console.caption = &amp;quot;Different Title&amp;quot;
@@ -145,12 +145,12 @@ print( cmd );
 &lt;p class=&quot;precaption&quot;>Listing 1: A Script That Displays the Grep Dialog&lt;/p>
 &lt;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 TQLineEdit called 'search_edit', so 
+  entering the text to be searched for is a TTQLineEdit 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 QLineEdits 
+  found the right object getting hold of the text is easy because all TQLineEdits 
   make their contents available as a property called 'text'. The code that gets 
-  the value of the check boxes is almost identical, except that these are QCheckBoxes 
+  the value of the check boxes is almost identical, except that these are TQCheckBoxes 
   so it's the 'checked' property we're interested in.&lt;/p>
 &lt;p align=&quot;center&quot;>&lt;img src=&quot;grepdlg.png&quot; alt=&quot;Grep Dialog Screenshot&quot; width=&quot;327&quot; height=&quot;241&quot;>&lt;/p>
 &lt;p class=&quot;imgcaption&quot;>Figure 3: The Grep Dialog&lt;/p>
diff --git a/kjsembed/docs/examples/imagefun/bump.ui b/kjsembed/docs/examples/imagefun/bump.ui
index 90c5cc95..eb342eac 100644
--- a/kjsembed/docs/examples/imagefun/bump.ui
+++ b/kjsembed/docs/examples/imagefun/bump.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>Form1</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="6">
+        <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="6">
             <property name="name">
                 <cstring>layout1</cstring>
             </property>
@@ -41,7 +41,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>go</cstring>
                     </property>
@@ -51,7 +51,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="6">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="6">
             <property name="name">
                 <cstring>view</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
                 <cstring>layout5</cstring>
             </property>
@@ -75,7 +75,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -93,7 +93,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="4" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="3" column="4" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>layout9</cstring>
             </property>
@@ -101,7 +101,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel9</cstring>
                     </property>
@@ -109,7 +109,7 @@
                         <string>Type:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>Linear</string>
@@ -131,7 +131,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="3" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="3" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>layout3</cstring>
             </property>
@@ -139,7 +139,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel5</cstring>
                     </property>
@@ -157,7 +157,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="2" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="1" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>layout6</cstring>
             </property>
@@ -165,7 +165,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -183,7 +183,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="2" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="3" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>layout8</cstring>
             </property>
@@ -191,7 +191,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel7</cstring>
                     </property>
@@ -206,7 +206,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>layout4</cstring>
             </property>
@@ -214,7 +214,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel4</cstring>
                     </property>
@@ -232,7 +232,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>layout7</cstring>
             </property>
@@ -240,7 +240,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -258,7 +258,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>layout2</cstring>
             </property>
@@ -266,7 +266,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel6</cstring>
                     </property>
@@ -281,7 +281,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QCheckBox" row="4" column="5">
+        <widget class="TQCheckBox" row="4" column="5">
             <property name="name">
                 <cstring>tiled</cstring>
             </property>
@@ -289,7 +289,7 @@
                 <string>Tiled</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="4" column="2" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="4" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>invert</cstring>
             </property>
@@ -297,7 +297,7 @@
                 <string>Invert</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="4" column="0">
+        <widget class="TQCheckBox" row="4" column="0">
             <property name="name">
                 <cstring>compensate</cstring>
             </property>
diff --git a/kjsembed/docs/examples/imagefun/bumptest.png b/kjsembed/docs/examples/imagefun/bumptest.png
index b6954838..4797fefb 100644
--- a/kjsembed/docs/examples/imagefun/bumptest.png
+++ b/kjsembed/docs/examples/imagefun/bumptest.png
diff --git a/kjsembed/docs/examples/imagefun/title.js b/kjsembed/docs/examples/imagefun/title.js
index 749899be..a195173e 100755
--- a/kjsembed/docs/examples/imagefun/title.js
+++ b/kjsembed/docs/examples/imagefun/title.js
@@ -23,7 +23,7 @@ if (painter.begin(textlayer) )
 	painter.drawRoundRect( 5, 5, w-5, h-5, 25, 25 );
 	if( painter.end() )
 	{
-		var lbl = new QLabel();
+		var lbl = new TQLabel();
 		var img = new Image(this);
 		img.setPixmap( painter.pixmap() );
 
diff --git a/kjsembed/docs/examples/imageinfo/example.html b/kjsembed/docs/examples/imageinfo/example.html
index 2f616027..58205bda 100644
--- a/kjsembed/docs/examples/imageinfo/example.html
+++ b/kjsembed/docs/examples/imageinfo/example.html
@@ -5,12 +5,12 @@
 <body>
 <h1 align="center">Image Gallery</h1>
 <hr>
-<p>Here are some images, the larger ones have been scaled down to ensure this page loads quickly. Click on an image or filename to see it full size.</p>
+<p>Here are some images, the larger ones have been scaled down to ensure this page loads tquickly. Click on an image or filename to see it full size.</p>
 <table border=0 width="90%" cellpadding="12" cellspacing="1">
 <tr>
 <td align="center"><a href="example1.png"><img border=0 width=197 height=160 src=thumb-example1.png></a></td>
 <td width="60%" valign="top" align="justify"><b><a href="example1.png">example1.png</a></b> (848x686)<p>This image shows the results of running the imagegallery script. As you can
-see the script automatically creates thumbnails (using TQImage::smoothScale()
+see the script automatically creates thumbnails (using TTQImage::smoothScale()
 for quality) and includes image descriptions if present. The descriptions can
 include HTML markup <b>like</b> <i>this</i>, and even
 <a href="http://xmelegance.org/kjsembed/">links</a>.
diff --git a/kjsembed/docs/examples/imageinfo/example1.htm b/kjsembed/docs/examples/imageinfo/example1.htm
index bbe9bb0b..3a0a4ef9 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 TQImage::smoothScale()
+see the script automatically creates thumbnails (using TTQImage::smoothScale()
 for quality) and includes image descriptions if present. The descriptions can
 include HTML markup <b>like</b> <i>this</i>, and even
 <a href="http://xmelegance.org/kjsembed/">links</a>.
diff --git a/kjsembed/docs/examples/imageinfo/example1.png b/kjsembed/docs/examples/imageinfo/example1.png
index 53408e63..e9228040 100644
--- a/kjsembed/docs/examples/imageinfo/example1.png
+++ b/kjsembed/docs/examples/imageinfo/example1.png
diff --git a/kjsembed/docs/examples/imageinfo/example4.png b/kjsembed/docs/examples/imageinfo/example4.png
index 9c2d9ae3..340ca8c3 100644
--- a/kjsembed/docs/examples/imageinfo/example4.png
+++ b/kjsembed/docs/examples/imageinfo/example4.png
diff --git a/kjsembed/docs/examples/imageinfo/imagegallery.js b/kjsembed/docs/examples/imageinfo/imagegallery.js
index 4cc5bc2d..dba3951c 100755
--- a/kjsembed/docs/examples/imageinfo/imagegallery.js
+++ b/kjsembed/docs/examples/imageinfo/imagegallery.js
@@ -6,7 +6,7 @@
 
 var default_title = 'Image Gallery';
 var default_intro =   'Here are some images, the larger ones have been scaled down to '
-                    + 'ensure this page loads quickly. Click on an image or filename '
+                    + 'ensure this page loads tquickly. Click on an image or filename '
                     + 'to see it full size.';
 var default_width = 250;
 var default_height = 160;
diff --git a/kjsembed/docs/examples/imageinfo/thumb-example1.png b/kjsembed/docs/examples/imageinfo/thumb-example1.png
index 79eca5d7..118f4e7c 100644
--- a/kjsembed/docs/examples/imageinfo/thumb-example1.png
+++ b/kjsembed/docs/examples/imageinfo/thumb-example1.png
diff --git a/kjsembed/docs/examples/imageinfo/thumb-example2.png b/kjsembed/docs/examples/imageinfo/thumb-example2.png
index f4c805e7..18428293 100644
--- a/kjsembed/docs/examples/imageinfo/thumb-example2.png
+++ b/kjsembed/docs/examples/imageinfo/thumb-example2.png
diff --git a/kjsembed/docs/examples/imageinfo/thumb-example3.png b/kjsembed/docs/examples/imageinfo/thumb-example3.png
index 7a449b6c..8ea2689c 100644
--- a/kjsembed/docs/examples/imageinfo/thumb-example3.png
+++ b/kjsembed/docs/examples/imageinfo/thumb-example3.png
diff --git a/kjsembed/docs/examples/imageinfo/thumb-example4.png b/kjsembed/docs/examples/imageinfo/thumb-example4.png
index 42fb6022..b733f08a 100644
--- a/kjsembed/docs/examples/imageinfo/thumb-example4.png
+++ b/kjsembed/docs/examples/imageinfo/thumb-example4.png
diff --git a/kjsembed/docs/examples/imageinfo/thumbs.html b/kjsembed/docs/examples/imageinfo/thumbs.html
index dd8ae478..b47501f8 100644
--- a/kjsembed/docs/examples/imageinfo/thumbs.html
+++ b/kjsembed/docs/examples/imageinfo/thumbs.html
@@ -5,12 +5,12 @@
 <body>
 <h1 align="center">Image Gallery</h1>
 <hr>
-<p>Here are some images, the larger ones have been scaled down to ensure this page loads quickly. Click on an image or filename to see it full size.</p>
+<p>Here are some images, the larger ones have been scaled down to ensure this page loads tquickly. Click on an image or filename to see it full size.</p>
 <table border=0 width="90%" cellpadding="12" cellspacing="1">
 <tr>
 <td align="center"><a href="example1.png"><img border=0 width=197 height=160 src="thumb-example1.png"></a></td>
 <td width="60%" valign="top" align="justify"><b><a href="example1.png">example1.png</a></b> (848x686)<p>This image shows the results of running the imagegallery script. As you can
-see the script automatically creates thumbnails (using TQImage::smoothScale()
+see the script automatically creates thumbnails (using TTQImage::smoothScale()
 for quality) and includes image descriptions if present. The descriptions can
 include HTML markup <b>like</b> <i>this</i>, and even
 <a href="http://xmelegance.org/kjsembed/">links</a>.
diff --git a/kjsembed/docs/examples/imagetweak/example1.png b/kjsembed/docs/examples/imagetweak/example1.png
index 53408e63..e9228040 100644
--- a/kjsembed/docs/examples/imagetweak/example1.png
+++ b/kjsembed/docs/examples/imagetweak/example1.png
diff --git a/kjsembed/docs/examples/imagetweak/example4.png b/kjsembed/docs/examples/imagetweak/example4.png
index 9c2d9ae3..340ca8c3 100644
--- a/kjsembed/docs/examples/imagetweak/example4.png
+++ b/kjsembed/docs/examples/imagetweak/example4.png
diff --git a/kjsembed/docs/examples/imagetweak/imagetweak.js b/kjsembed/docs/examples/imagetweak/imagetweak.js
index df7c86f9..ea1d0944 100755
--- a/kjsembed/docs/examples/imagetweak/imagetweak.js
+++ b/kjsembed/docs/examples/imagetweak/imagetweak.js
@@ -8,10 +8,10 @@ if ( application.args.length == 0 ) {
 // Setup main window
 //
 var mw = new KMainWindow();
-var view = new QScrollView( mw, 'view' );
+var view = new TQScrollView( mw, 'view' );
 mw.setCentralWidget( view );
 
-var lbl = new QLabel( view, 'view' );
+var lbl = new TQLabel( view, 'view' );
 view.addChild( lbl );
 
 //
diff --git a/kjsembed/docs/examples/imageviewer/imageviewer.js b/kjsembed/docs/examples/imageviewer/imageviewer.js
index f69d63c3..13fd1128 100644
--- a/kjsembed/docs/examples/imageviewer/imageviewer.js
+++ b/kjsembed/docs/examples/imageviewer/imageviewer.js
@@ -17,7 +17,7 @@ if ( application.args.length == 0 ) {
 }
 else {
     var loc = application.args[0];
-    var lbl = new QLabel();
+    var lbl = new TQLabel();
 
     var img = new Image();
     img.load( loc );
diff --git a/kjsembed/docs/examples/imunge/effectbrowser.ui b/kjsembed/docs/examples/imunge/effectbrowser.ui
index b3ee2255..d088d18e 100644
--- a/kjsembed/docs/examples/imunge/effectbrowser.ui
+++ b/kjsembed/docs/examples/imunge/effectbrowser.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>EffectBrowser</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>EffectBrowser</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="3" column="1">
+        <widget class="TQGroupBox" row="3" column="1">
             <property name="name">
                 <cstring>settings_group</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <string>Settings</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="1">
+        <widget class="TQLabel" row="2" column="1">
             <property name="name">
                 <cstring>preview</cstring>
             </property>
@@ -66,7 +66,7 @@
                 <set>AlignCenter</set>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
diff --git a/kjsembed/docs/examples/imunge/imunge.js b/kjsembed/docs/examples/imunge/imunge.js
index 72de2c5c..6f75cbf1 100755
--- a/kjsembed/docs/examples/imunge/imunge.js
+++ b/kjsembed/docs/examples/imunge/imunge.js
@@ -9,9 +9,9 @@ mb = mw.menuBar();
 sb = mw.statusBar();
 mw.setStandardToolBarMenuEnabled( true );
 
-view = new QScrollView( mw, 'view' );
+view = new TQScrollView( mw, 'view' );
 
-lbl = new QLabel( view, 'view' );
+lbl = new TQLabel( view, 'view' );
 lbl.alignment = Qt.AlignCenter;
 lbl.text = 'No Content';
 
@@ -226,7 +226,7 @@ mw.setup_actions = function()
 load( 'imunge_actions.js' );
 mw.setup_actions();
 
-cwd = (new QDir()).absPath();
+cwd = (new TQDir()).absPath();
 mw.createGUI( cwd + '/imungeui.rc' );
 mw.resize( 700, 500 );
 
diff --git a/kjsembed/docs/examples/imunge/imunge_actions.js b/kjsembed/docs/examples/imunge/imunge_actions.js
index 586641d9..e07d01d4 100755
--- a/kjsembed/docs/examples/imunge/imunge_actions.js
+++ b/kjsembed/docs/examples/imunge/imunge_actions.js
@@ -5,8 +5,8 @@
 
 mw.create_effect_browser = function()
 {
-    this.effectsdlg = new QDialog( this );
-    var vb = new QVBoxLayout( this.effectsdlg );
+    this.effectsdlg = new TQDialog( this );
+    var vb = new TQVBoxLayout( this.effectsdlg );
 
     this.effects = Factory.loadui( 'effectbrowser.ui', null, this.effectsdlg );
     vb.addWidget( this.effects );
diff --git a/kjsembed/docs/examples/imunge/resizeparams.ui b/kjsembed/docs/examples/imunge/resizeparams.ui
index fe66f437..a7dbfd0a 100644
--- a/kjsembed/docs/examples/imunge/resizeparams.ui
+++ b/kjsembed/docs/examples/imunge/resizeparams.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>ResizeParams</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ResizeParams</cstring>
     </property>
@@ -27,7 +27,7 @@
                 <cstring>height_input</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel3</cstring>
             </property>
@@ -40,7 +40,7 @@
                 <cstring>width_input</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>textLabel4</cstring>
             </property>
@@ -48,7 +48,7 @@
                 <string>Height:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -89,7 +89,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -103,7 +103,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -134,7 +134,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -151,7 +151,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
diff --git a/kjsembed/docs/examples/index.html b/kjsembed/docs/examples/index.html
index 4b48cc31..a3a44761 100644
--- a/kjsembed/docs/examples/index.html
+++ b/kjsembed/docs/examples/index.html
@@ -75,21 +75,21 @@ facilities.
 <td>Two examples that create a graphical tree. One
 from a JS data structure, the other from the widget tree of a ui file.</td></tr>
 <tr><td><a href="qobject-dom">qobject-dom</a></td>
-<td>Illustrates the TQObject DOM API.</td></tr>
+<td>Illustrates the TTQObject DOM API.</td></tr>
 <tr><td><a href="connect-cpp">connect-cpp</a></td>
 <td>Connects a signal to slot.</td></tr>
 <tr><td><a href="connect">connect</a></td>
 <td>Connects signals of various types to JS methods.</td></tr>
 <tr><td><a href="imageviewer">imageviewer</a></td>
-<td>Illustrates the use of TQPixmap values.</td></tr>
+<td>Illustrates the use of TTQPixmap values.</td></tr>
 <tr><td><a href="netaccess">netaccess</a></td>
 <td>Illustrates the bindings to KIO::NetAccess.</td></tr>
 <tr><td><a href="listview">listview</a></td>
 <td>Creates a simple KListView.</td></tr>
 <tr><td><a href="frame">frame</a></td>
-<td>Shows off TQFrame support and the use of enums.</td></tr>
+<td>Shows off TTQFrame support and the use of enums.</td></tr>
 <tr><td><a href="timer">timer</a></td>
-<td>Creates a flashing LED using TQTimer.</td></tr>
+<td>Creates a flashing LED using TTQTimer.</td></tr>
 <tr><td><a href="actions">Actions</a></td>
 <td>A simple KAction demo.</td></tr>
 <tr><td><a href="builtins">Built-In Messages</a></td>
@@ -108,8 +108,8 @@ from a JS data structure, the other from the widget tree of a ui file.</td></tr>
 <td>Opaque types.</td></tr>
 <tr><td><a href="stdicons">Standard Icons</a></td>
 <td>Loading standard icons.</td></tr>
-<tr><td><a href="combobox">TQComboBox</a></td>
-<td>A simple demo of TQComboBox.</td></tr>
+<tr><td><a href="combobox">TTQComboBox</a></td>
+<td>A simple demo of TTQComboBox.</td></tr>
 <tr><td><a href="multipart">Embedding several KParts</a></td>
 <td>Shows how to embed multiple parts in the same script.</td></tr>
 <tr><td><a href="livedata">Writing data directly to a KPart</a></td>
diff --git a/kjsembed/docs/examples/invaders/invaders.js b/kjsembed/docs/examples/invaders/invaders.js
index 55531258..bca6dce4 100755
--- a/kjsembed/docs/examples/invaders/invaders.js
+++ b/kjsembed/docs/examples/invaders/invaders.js
@@ -14,12 +14,12 @@ var hitflag = 0;
 var score = 0;
 var selec = 0;
 var rsmiss = "";
-var timer = new QTimer(this);
+var timer = new TQTimer(this);
 timer.connect(timer, "timeout()", this, "doTurn");
 
 var win = new KMainWindow(this);
-var box = new QVBox(win);
-var view = new QLabel(box);
+var box = new TQVBox(win);
+var view = new TQLabel(box);
 //view.setMouseTracking(true);
 
 view.font = "courier,12,-1,5,75,0,0,0,0,0"
@@ -160,7 +160,7 @@ function gameover()
     if (score == 0) {
 	view.text = cr + cr + cr + cr + cr + cr + cr + cr
 	    + "                        Congratulations!" + cr + cr
-	    + "                          YOU STOPPED THE ENEMY SQUAD!!";
+	    + "                          YOU STOPPED THE ENEMY STQUAD!!";
     } else {
 	view.text = cr + cr + cr + cr + cr + cr + cr + cr
 	    + "                           GAME OVER" + cr + cr
diff --git a/kjsembed/docs/examples/kjsuic/kjsuic.js b/kjsembed/docs/examples/kjsuic/kjsuic.js
index f95aa5ee..fcea8bb0 100644
--- a/kjsembed/docs/examples/kjsuic/kjsuic.js
+++ b/kjsembed/docs/examples/kjsuic/kjsuic.js
@@ -38,7 +38,7 @@ function addChildren( widget )
                 eval(str);
 		var typeName = widget.child(lst[idx]).className();
 
-		if( typeName == "QGroupBox" || typeName == "QButtonGroup" || typeName == "QFrame")
+		if( typeName == "TQGroupBox" || typeName == "TQButtonGroup" || typeName == "TQFrame")
 		{
 			eval("addChildren( widget." + lst[idx] + ");");
 		}
diff --git a/kjsembed/docs/examples/listview/listview.js b/kjsembed/docs/examples/listview/listview.js
index 5bca90c5..04197005 100644
--- a/kjsembed/docs/examples/listview/listview.js
+++ b/kjsembed/docs/examples/listview/listview.js
@@ -2,7 +2,7 @@
 
 // Create main view
 var mw = new KMainWindow();
-var box = new QVBox( mw );
+var box = new TQVBox( mw );
 mw.setCentralWidget(box);
 
 var lv = new KListView( box );
diff --git a/kjsembed/docs/examples/livedata/livepartdata.js b/kjsembed/docs/examples/livedata/livepartdata.js
index 345e84e9..34866f5c 100644
--- a/kjsembed/docs/examples/livedata/livepartdata.js
+++ b/kjsembed/docs/examples/livedata/livepartdata.js
@@ -4,7 +4,7 @@
 var mw = new KParts_MainWindow();
 var ac = mw.actionCollection();
 
-var split = new QSplitter( mw );
+var split = new TQSplitter( mw );
 mw.setCentralWidget( split );
 
 var view = Factory.createROPart( "text/html", split, "html" );
diff --git a/kjsembed/docs/examples/madminute/configdialog.ui b/kjsembed/docs/examples/madminute/configdialog.ui
index 3760c11d..968c9b1f 100644
--- a/kjsembed/docs/examples/madminute/configdialog.ui
+++ b/kjsembed/docs/examples/madminute/configdialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>configDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>configDialog</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -55,7 +55,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
                 <cstring>layout10</cstring>
             </property>
@@ -63,7 +63,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -71,7 +71,7 @@
                         <string>Operations:</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>addition</cstring>
                     </property>
@@ -79,7 +79,7 @@
                         <string>Addition</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>subtraction</cstring>
                     </property>
@@ -89,7 +89,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
                 <cstring>layout11</cstring>
             </property>
@@ -97,7 +97,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -105,7 +105,7 @@
                         <string>Time:</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox">
+                <widget class="TQSpinBox">
                     <property name="name">
                         <cstring>time</cstring>
                     </property>
@@ -124,7 +124,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="6" column="0">
+        <widget class="TQLayoutWidget" row="6" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -138,7 +138,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -169,7 +169,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -186,7 +186,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -202,7 +202,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0">
+        <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
                 <cstring>layout10</cstring>
             </property>
@@ -212,7 +212,7 @@
                 </property>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="5" column="0">
+        <widget class="TQLayoutWidget" row="5" column="0">
             <property name="name">
                 <cstring>layout11</cstring>
             </property>
@@ -220,7 +220,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_2_2</cstring>
                     </property>
diff --git a/kjsembed/docs/examples/madminute/helpdialog.ui b/kjsembed/docs/examples/madminute/helpdialog.ui
index baa1a4e4..a5e78d51 100644
--- a/kjsembed/docs/examples/madminute/helpdialog.ui
+++ b/kjsembed/docs/examples/madminute/helpdialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>helpDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>helpDialog</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTextBrowser">
+        <widget class="TQTextBrowser">
             <property name="name">
                 <cstring>helpText</cstring>
             </property>
@@ -36,7 +36,7 @@ This is a small mathdrill program to help students become faster at simple addit
 Once the application is configured the student can start the drill by pressing the "&lt;b&gt;Go&lt;/b&gt;" button or "&lt;tt&gt;Ctrl+G&lt;/tt&gt;".  Once the drill is started the student may answer the questions as fast as they can and press the "&lt;tt&gt;Enter&lt;/tt&gt; key to submit the answer.  The drill will notify the student when it is complete.</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout9</cstring>
             </property>
@@ -61,7 +61,7 @@ Once the application is configured the student can start the drill by pressing t
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pushButton7</cstring>
                     </property>
diff --git a/kjsembed/docs/examples/madminute/madminute.js b/kjsembed/docs/examples/madminute/madminute.js
index a2762cde..97debe4d 100755
--- a/kjsembed/docs/examples/madminute/madminute.js
+++ b/kjsembed/docs/examples/madminute/madminute.js
@@ -15,7 +15,7 @@ var Subtraction = 2;
 var config = new Config("madminute");
 config.setGroup("Game Options");
 // Timer
-var timer = new QTimer(this);
+var timer = new TQTimer(this);
 // Current Argument 1
 var arg1 = 0;
 // Current Argument 2
diff --git a/kjsembed/docs/examples/madminute/madminute.ui b/kjsembed/docs/examples/madminute/madminute.ui
index dadab4d8..1154312a 100644
--- a/kjsembed/docs/examples/madminute/madminute.ui
+++ b/kjsembed/docs/examples/madminute/madminute.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MainWindow</class>
 <author>Ian Reinhart Geiser &lt;geiseri@kde.org&gt;</author>
-<widget class="QMainWindow">
+<widget class="TQMainWindow">
     <property name="name">
         <cstring>MadMinute</cstring>
     </property>
@@ -23,7 +23,7 @@
         <property name="margin">
             <number>3</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout8</cstring>
             </property>
@@ -31,7 +31,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -63,7 +63,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout7</cstring>
             </property>
@@ -71,7 +71,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>layout6</cstring>
                     </property>
@@ -79,7 +79,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout5</cstring>
                             </property>
@@ -87,7 +87,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>question</cstring>
                                     </property>
@@ -106,7 +106,7 @@
                                         </size>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit">
+                                <widget class="TQLineEdit">
                                     <property name="name">
                                         <cstring>answer</cstring>
                                     </property>
@@ -125,7 +125,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout3</cstring>
                             </property>
@@ -133,7 +133,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel1</cstring>
                                     </property>
@@ -144,7 +144,7 @@
                                         <set>AlignVCenter</set>
                                     </property>
                                 </widget>
-                                <widget class="QProgressBar">
+                                <widget class="TQProgressBar">
                                     <property name="name">
                                         <cstring>timeleft</cstring>
                                     </property>
@@ -172,7 +172,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout6_2</cstring>
             </property>
@@ -180,7 +180,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -208,7 +208,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLCDNumber">
+                <widget class="TQLCDNumber">
                     <property name="name">
                         <cstring>correct</cstring>
                     </property>
diff --git a/kjsembed/docs/examples/multipart/multipart.js b/kjsembed/docs/examples/multipart/multipart.js
index 89402f79..e08a3d8c 100644
--- a/kjsembed/docs/examples/multipart/multipart.js
+++ b/kjsembed/docs/examples/multipart/multipart.js
@@ -7,7 +7,7 @@
 //
 // Main
 //
-var qd = new QDir();
+var qd = new TQDir();
 
 var dir = 'file://' + qd.path() + '/../';
 var file = dir + 'index.html';
@@ -16,7 +16,7 @@ var file = dir + 'index.html';
 var mw = new KParts_MainWindow();
 var ac = mw.actionCollection();
 
-var split = new QSplitter( mw );
+var split = new TQSplitter( mw );
 mw.setCentralWidget( split );
 
 //
@@ -27,7 +27,7 @@ var side = Factory.createROPart( "inode/directory", split, "sidebar" );
 //
 // Load the views
 //
-var views = new QSplitter( split );
+var views = new TQSplitter( split );
 views.orientation = 1;
 
 var top = Factory.createROPart( "text/html", views, "html" );
diff --git a/kjsembed/docs/examples/netaccess/net.js b/kjsembed/docs/examples/netaccess/net.js
index c406d79b..440cf34f 100755
--- a/kjsembed/docs/examples/netaccess/net.js
+++ b/kjsembed/docs/examples/netaccess/net.js
@@ -15,7 +15,7 @@ if ( ret ) {
         warn( 'Failed to load image '+loc);
     } else {
         print( 'Image ' + loc + ' is OK \n' );
-        var lbl = new QLabel();
+        var lbl = new TQLabel();
         lbl.pixmap = img.pixmap();
         lbl.show();
         application.exec();
diff --git a/kjsembed/docs/examples/opaquevalues/opaque.js b/kjsembed/docs/examples/opaquevalues/opaque.js
index f92fb6f2..3c22f04a 100755
--- a/kjsembed/docs/examples/opaquevalues/opaque.js
+++ b/kjsembed/docs/examples/opaquevalues/opaque.js
@@ -3,10 +3,10 @@
 // Usage: kjscmd --noexec opaque.js 2>/dev/null
 
 //
-// Test QVariant support
+// Test TQVariant support
 //
 
-var w = new QLabel();
+var w = new TQLabel();
 w.text = 'Test';
 
 var sp = w.sizePolicy;
diff --git a/kjsembed/docs/examples/qdocviewer/docviewer.ui b/kjsembed/docs/examples/qdocviewer/docviewer.ui
index 33db5ff2..94b7458b 100755
--- a/kjsembed/docs/examples/qdocviewer/docviewer.ui
+++ b/kjsembed/docs/examples/qdocviewer/docviewer.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>HelpUI</class>
-<widget class="QMainWindow">
+<widget class="TQMainWindow">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>2</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>layout1</cstring>
             </property>
@@ -30,14 +30,14 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QToolBox">
+                <widget class="TQToolBox">
                     <property name="name">
                         <cstring>Navbar</cstring>
                     </property>
                     <property name="currentIndex">
                         <number>5</number>
                     </property>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>StaticObjects</cstring>
                         </property>
@@ -57,7 +57,7 @@
                             <property name="spacing">
                                 <number>1</number>
                             </property>
-                            <widget class="QListBox" row="0" column="0">
+                            <widget class="TQListBox" row="0" column="0">
                                 <item>
                                     <property name="text">
                                         <string>New Item</string>
@@ -69,7 +69,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>ObjectTypes</cstring>
                         </property>
@@ -89,7 +89,7 @@
                             <property name="spacing">
                                 <number>1</number>
                             </property>
-                            <widget class="QListBox" row="0" column="0">
+                            <widget class="TQListBox" row="0" column="0">
                                 <item>
                                     <property name="text">
                                         <string>New Item</string>
@@ -101,7 +101,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>KJSEmbedObjects</cstring>
                         </property>
@@ -121,7 +121,7 @@
                             <property name="spacing">
                                 <number>1</number>
                             </property>
-                            <widget class="QListBox" row="0" column="0">
+                            <widget class="TQListBox" row="0" column="0">
                                 <item>
                                     <property name="text">
                                         <string>New Item</string>
@@ -133,7 +133,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>QtObjects</cstring>
                         </property>
@@ -153,7 +153,7 @@
                             <property name="spacing">
                                 <number>1</number>
                             </property>
-                            <widget class="QListBox" row="0" column="0">
+                            <widget class="TQListBox" row="0" column="0">
                                 <item>
                                     <property name="text">
                                         <string>New Item</string>
@@ -165,7 +165,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>KDEObjects</cstring>
                         </property>
@@ -185,7 +185,7 @@
                             <property name="spacing">
                                 <number>1</number>
                             </property>
-                            <widget class="QListBox" row="0" column="0">
+                            <widget class="TQListBox" row="0" column="0">
                                 <item>
                                     <property name="text">
                                         <string>New Item</string>
@@ -197,7 +197,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>ExceptionTypes</cstring>
                         </property>
@@ -217,7 +217,7 @@
                             <property name="spacing">
                                 <number>1</number>
                             </property>
-                            <widget class="QListBox" row="0" column="0">
+                            <widget class="TQListBox" row="0" column="0">
                                 <item>
                                     <property name="text">
                                         <string>New Item</string>
@@ -229,7 +229,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>UnconstructableTypes</cstring>
                         </property>
@@ -249,7 +249,7 @@
                             <property name="spacing">
                                 <number>1</number>
                             </property>
-                            <widget class="QListBox" row="0" column="0">
+                            <widget class="TQListBox" row="0" column="0">
                                 <item>
                                     <property name="text">
                                         <string>New Item</string>
@@ -261,7 +261,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>Search</cstring>
                         </property>
@@ -281,7 +281,7 @@
                             <property name="spacing">
                                 <number>2</number>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>layout2</cstring>
                                 </property>
@@ -289,7 +289,7 @@
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLineEdit">
+                                    <widget class="TQLineEdit">
                                         <property name="name">
                                             <cstring>SearchLine</cstring>
                                         </property>
@@ -302,7 +302,7 @@
                                             </sizepolicy>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>Search</cstring>
                                         </property>
@@ -312,7 +312,7 @@
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QListBox">
+                            <widget class="TQListBox">
                                 <item>
                                     <property name="text">
                                         <string>New Item</string>
@@ -333,7 +333,7 @@
                         </vbox>
                     </widget>
                 </widget>
-                <widget class="QTextBrowser">
+                <widget class="TQTextBrowser">
                     <property name="name">
                         <cstring>HelpPage</cstring>
                     </property>
diff --git a/kjsembed/docs/examples/qdocviewer/qdocviewer.js b/kjsembed/docs/examples/qdocviewer/qdocviewer.js
index 41ae2835..8b40e096 100644
--- a/kjsembed/docs/examples/qdocviewer/qdocviewer.js
+++ b/kjsembed/docs/examples/qdocviewer/qdocviewer.js
@@ -109,23 +109,23 @@ populateStaticObjects();
 populateExceptions();
 populateObjects();
 
-mw.connect( StaticObjectList, 'highlighted(const QString&)', this, 'documentStaticObject' );
-mw.connect( ExceptionTypeList, 'highlighted(const QString&)', this, 'documentStaticObject' );
-mw.connect( KDEObjectList, 'highlighted(const QString&)', this, 'documentConstructableObject' );
-mw.connect( QtObjectList, 'highlighted(const QString&)', this, 'documentConstructableObject' );
-mw.connect( KJSEmbedObjectList, 'highlighted(const QString&)', this, 'documentConstructableObject' );
-mw.connect( ObjectTypeList, 'highlighted(const QString&)', this, 'documentConstructableObject' );
+mw.connect( StaticObjectList, 'highlighted(const TQString&)', this, 'documentStaticObject' );
+mw.connect( ExceptionTypeList, 'highlighted(const TQString&)', this, 'documentStaticObject' );
+mw.connect( KDEObjectList, 'highlighted(const TQString&)', this, 'documentConstructableObject' );
+mw.connect( QtObjectList, 'highlighted(const TQString&)', this, 'documentConstructableObject' );
+mw.connect( KJSEmbedObjectList, 'highlighted(const TQString&)', this, 'documentConstructableObject' );
+mw.connect( ObjectTypeList, 'highlighted(const TQString&)', this, 'documentConstructableObject' );
 
 
 mw.show();
 application.exec();
 /*
 
-side = new QTabWidget( split, 'sidebar' );
-view = new QTabWidget( split, 'mainview' );
+side = new TQTabWidget( split, 'sidebar' );
+view = new TQTabWidget( split, 'mainview' );
 
 // Load the view
-js = new QTextEdit( view, 'js' );
+js = new TQTextEdit( view, 'js' );
 js.setReadOnly( true );
 
 view.addTab( js, '&Javascript' );
@@ -169,9 +169,9 @@ view.setup = function()
 }
 
 // Setup the sidebar
-specialside = new QListBox( side, 'specialsidebar' );
-qtside = new QListBox( side, 'qtsidebar' );
-allside = new QListBox( side, 'allsidebar' );
+specialside = new TQListBox( side, 'specialsidebar' );
+qtside = new TQListBox( side, 'qtsidebar' );
+allside = new TQListBox( side, 'allsidebar' );
 
 side.addTab( specialside, '&Special' );
 side.addTab( qtside, '&Qt' );
@@ -179,9 +179,9 @@ side.addTab( allside, '&All' );
 
 setup_sidebar( specialside, qtside, allside );
 
-qtside.connect( qtside, 'highlighted(const QString&)', view, 'set_class' );
-specialside.connect( specialside, 'highlighted(const QString&)', view, 'set_class' );
-allside.connect( allside, 'highlighted(const QString&)', view, 'set_class' );
+qtside.connect( qtside, 'highlighted(const TQString&)', view, 'set_class' );
+specialside.connect( specialside, 'highlighted(const TQString&)', view, 'set_class' );
+allside.connect( allside, 'highlighted(const TQString&)', view, 'set_class' );
 
 //
 // Show the window
diff --git a/kjsembed/docs/examples/readonlypart/readonlypart.js b/kjsembed/docs/examples/readonlypart/readonlypart.js
index 0f57b763..af1ec59c 100755
--- a/kjsembed/docs/examples/readonlypart/readonlypart.js
+++ b/kjsembed/docs/examples/readonlypart/readonlypart.js
@@ -9,7 +9,7 @@ if ( application.args.length )
 
 // Create the UI
 var mw = new KMainWindow();
-var box = new QHBox( mw );
+var box = new TQHBox( mw );
 mw.setCentralWidget(box);
 
 // Create the view
diff --git a/kjsembed/docs/examples/readwritepart/readwritepart.js b/kjsembed/docs/examples/readwritepart/readwritepart.js
index 3cc9c18c..d9663f8d 100755
--- a/kjsembed/docs/examples/readwritepart/readwritepart.js
+++ b/kjsembed/docs/examples/readwritepart/readwritepart.js
@@ -9,7 +9,7 @@ if ( application.args.length )
 
 // Create the UI
 var mw = new KMainWindow();
-var box = new QHBox( mw );
+var box = new TQHBox( mw );
 mw.setCentralWidget(box);
 
 // Create the view
diff --git a/kjsembed/docs/examples/sql/sql.js b/kjsembed/docs/examples/sql/sql.js
index 5ef568de..118510d4 100755
--- a/kjsembed/docs/examples/sql/sql.js
+++ b/kjsembed/docs/examples/sql/sql.js
@@ -2,10 +2,10 @@
 
 var db = new SqlDatabase();
 var mw = new KMainWindow();
-var box = new QVBox( mw );
+var box = new TQVBox( mw );
 mw.setCentralWidget(box);
 
-if ( db.addDatabase("QMYSQL3", "test" ))
+if ( db.addDatabase("TQMYSQL3", "test" ))
 {
 	db.databaseName = "XXXX";
 	db.userName = "XXXX";
diff --git a/kjsembed/docs/examples/stdicons/stdicons.js b/kjsembed/docs/examples/stdicons/stdicons.js
index e01c96ec..104ebd61 100755
--- a/kjsembed/docs/examples/stdicons/stdicons.js
+++ b/kjsembed/docs/examples/stdicons/stdicons.js
@@ -1,11 +1,11 @@
 #!/usr/bin/env kjscmd
 
-var mainBox = new QVBox(this);
-var Icon1 = new QLabel(mainBox);
-var Icon2 = new QLabel(mainBox);
-var Icon3 = new QLabel(mainBox);
-var Icon4 = new QLabel(mainBox);
-var Icon5 = new QLabel(mainBox);
+var mainBox = new TQVBox(this);
+var Icon1 = new TQLabel(mainBox);
+var Icon2 = new TQLabel(mainBox);
+var Icon3 = new TQLabel(mainBox);
+var Icon4 = new TQLabel(mainBox);
+var Icon5 = new TQLabel(mainBox);
 
 Icon1.pixmap = StdIcons.BarIcon("openterm");
 Icon2.pixmap = StdIcons.DesktopIcon("folder");
diff --git a/kjsembed/docs/examples/systemtray/systemtray.js b/kjsembed/docs/examples/systemtray/systemtray.js
index 5ecc55f0..1f87998c 100755
--- a/kjsembed/docs/examples/systemtray/systemtray.js
+++ b/kjsembed/docs/examples/systemtray/systemtray.js
@@ -5,7 +5,7 @@
 //
 
 // Create the main window
-mainwin = new QTextEdit(this);
+mainwin = new TQTextEdit(this);
 mainwin.text = '<qt>This is the main window for a script that illustrates '
 	     + 'the use of the <i>System Tray</i>.';
 
@@ -13,7 +13,7 @@ mainwin.text = '<qt>This is the main window for a script that illustrates '
 trayicon = new KSystemTray( mainwin );
 
 // Set the pixmap of the tray icon (we force it to be loaded from the cwd here)
-cwd = (new QDir()).absPath();
+cwd = (new TQDir()).absPath();
 trayicon.pixmap = trayicon.loadIcon( cwd + '/kjstray.png' );
 
 // Ensure we quit when you choose the option from the tray item's menu
diff --git a/kjsembed/docs/examples/timer/timer.js b/kjsembed/docs/examples/timer/timer.js
index fabb669f..a124eadb 100644
--- a/kjsembed/docs/examples/timer/timer.js
+++ b/kjsembed/docs/examples/timer/timer.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env kjscmd
 
 var led = new KLed();
-var timer = new QTimer();
+var timer = new TQTimer();
 led.connect( timer, 'timeout()', 'toggle()' );
 
 timer.start( 500 );
diff --git a/kjsembed/docs/examples/treeview/showtree.js b/kjsembed/docs/examples/treeview/showtree.js
index 76872d35..ea6b62d9 100644
--- a/kjsembed/docs/examples/treeview/showtree.js
+++ b/kjsembed/docs/examples/treeview/showtree.js
@@ -2,7 +2,7 @@
 
 function buildViewNode( node, parent )
 {
-    var l = new QLabel( parent, 'node' );
+    var l = new TQLabel( parent, 'node' );
     l.text = '<center><table cellspacing=0>'
 	+ '<tr><th bgcolor="#aaaaee"><b>' + node.text + '</b></th></tr>'
 	+ '<tr><td bgcolor="#ccccee">' + node.text + '</td></tr>'
@@ -20,14 +20,14 @@ function buildView( node, parent )
     }
 
     // Create container node
-    var vbox = new QVBox( parent, 'subtree' );
+    var vbox = new TQVBox( parent, 'subtree' );
     vbox.margin = 8;
     vbox.spacing = 6;
 
     var vnode = buildViewNode( node, vbox );
 
     // Create children
-    var hbox = new QHBox( vbox, 'child_nodes' );
+    var hbox = new TQHBox( vbox, 'child_nodes' );
     hbox.spacing = 6;
 
     for ( var i = 0 ; i < node.children.length ; i++ ) {
@@ -57,11 +57,11 @@ root.children[2].children = [ buildNode('One') ];
 root.children[2].children = [ buildNode('One'), buildNode('Two'), buildNode('Three') ];
 
 // Create View
-var box = new QVBox( 'tree_view' );
+var box = new TQVBox( 'tree_view' );
 box.margin = 6;
 
 var view = buildView( root, box );
-var spacer = new QLabel( box );
+var spacer = new TQLabel( box );
 
 box.show();
 
diff --git a/kjsembed/docs/examples/treeview/tree2.js b/kjsembed/docs/examples/treeview/tree2.js
index d8b8e09d..0999101f 100644
--- a/kjsembed/docs/examples/treeview/tree2.js
+++ b/kjsembed/docs/examples/treeview/tree2.js
@@ -1,10 +1,10 @@
 #!/usr/bin/env kjscmd
 
-// Demo that creates a tree from a ui file using QHBox and QBox.
+// Demo that creates a tree from a ui file using TQHBox and TQBox.
 
 function create_item( node, parent )
 {
-  var l = new QLabel( parent );
+  var l = new TQLabel( parent );
   l.paletteBackgroundColor = '#aaaaee';
   l.frameShape = 1;
   l.frameWidth = 1;
@@ -16,7 +16,7 @@ function create_item( node, parent )
 
 function create_subtree_layout( parent )
 {
-  var vb = new QVBox( parent );
+  var vb = new TQVBox( parent );
   vb.margin = 12;
 
   return vb;
@@ -24,7 +24,7 @@ function create_subtree_layout( parent )
 
 function create_child_layout( parent )
 {
-  var hb = new QHBox( parent );
+  var hb = new TQHBox( parent );
   hb.margin = 6;
 
   return hb;
@@ -48,7 +48,7 @@ function create_tree( node, parent )
 }
 
 var ui = Factory.loadui( 'treetest.ui' );
-var top = new QHBox();
+var top = new TQHBox();
 create_tree( ui, top );
 
 top.show();
diff --git a/kjsembed/docs/examples/treeview/treetest.ui b/kjsembed/docs/examples/treeview/treetest.ui
index c645e9c2..4c75034d 100644
--- a/kjsembed/docs/examples/treeview/treetest.ui
+++ b/kjsembed/docs/examples/treeview/treetest.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -12,7 +12,7 @@
             <height>116</height>
         </rect>
     </property>
-    <widget class="QSplitter">
+    <widget class="TQSplitter">
         <property name="name">
             <cstring>splitter1</cstring>
         </property>
@@ -27,7 +27,7 @@
         <property name="orientation">
             <enum>Horizontal</enum>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout1</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pushButton1</cstring>
                     </property>
@@ -43,7 +43,7 @@
                         <string>pushButton1</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pushButton2</cstring>
                     </property>
@@ -51,7 +51,7 @@
                         <string>pushButton2</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pushButton3</cstring>
                     </property>
@@ -61,7 +61,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout3</cstring>
             </property>
@@ -69,7 +69,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>layout2</cstring>
                     </property>
@@ -77,7 +77,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>pushButton4</cstring>
                             </property>
@@ -85,7 +85,7 @@
                                 <string>pushButton4</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>pushButton5</cstring>
                             </property>
@@ -95,7 +95,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pushButton6</cstring>
                     </property>
diff --git a/kjsembed/docs/examples/xmlgui/xmlgui.js b/kjsembed/docs/examples/xmlgui/xmlgui.js
index ac0f7113..a951a2ed 100755
--- a/kjsembed/docs/examples/xmlgui/xmlgui.js
+++ b/kjsembed/docs/examples/xmlgui/xmlgui.js
@@ -5,7 +5,7 @@
 //
 var mw = new KMainWindow();
 
-var view = new QTextEdit( mw, 'view' );
+var view = new TQTextEdit( mw, 'view' );
 view.text = '<h1>Hello World</h1>'
 	  + '<p>This application is written entirely in Javascript and works '
 	  + 'thanks to KJSEmbed</p>';
diff --git a/kjsembed/docs/features.html b/kjsembed/docs/features.html
index 5da39771..8c8e378d 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.
 
 <h2>Qt Integration</h2>
 <ul>
-<li>Generic proxy class providing access to any TQObject.
+<li>Generic proxy class providing access to any TTQObject.
 <li>Call slots from scripts as if they are JS methods.
 <li>Connect signals to JS methods as if they are slots.
-<li>Navigate the TQObject tree using a DOM compatible API.
+<li>Navigate the TTQObject tree using a DOM compatible API.
 <li>Load designer's UI files to dynamically load dialogs and widgets.
-<li>Create any TQWidget supported by TQWidgetFactory.
-<li>Custom factory for creating QObjects (such as TQTimer).
-<li>An opaque wrapper handling any TQVariant value and any pointer.
+<li>Create any TTQWidget supported by TTQWidgetFactory.
+<li>Custom factory for creating TQObjects (such as TTQTimer).
+<li>An opaque wrapper handling any TTQVariant value and any pointer.
 </ul>
 
 <h2>KDE Integration</h2>
diff --git a/kjsembed/docs/images/embedjs.png b/kjsembed/docs/images/embedjs.png
index eb18347a..03a40caa 100644
--- a/kjsembed/docs/images/embedjs.png
+++ b/kjsembed/docs/images/embedjs.png
diff --git a/kjsembed/docs/images/jscalc.png b/kjsembed/docs/images/jscalc.png
index 097b3f7c..63d00726 100644
--- a/kjsembed/docs/images/jscalc.png
+++ b/kjsembed/docs/images/jscalc.png
diff --git a/kjsembed/docs/index.html b/kjsembed/docs/index.html
index 2e113790..735310aa 100644
--- a/kjsembed/docs/index.html
+++ b/kjsembed/docs/index.html
@@ -74,8 +74,8 @@ who want to write scripts.
   <li><b><a href="conventions.html">Document Conventions</a></b><br>
   Explains the typographical conventions used by the documents.</li>
 
-  <li><b><a href="kjsembed-qsa.html">KJSEmbed and QSA</a></b><br>
-  Discusses the differences between KJSEmbed and QSA.</li>
+  <li><b><a href="kjsembed-qsa.html">KJSEmbed and TQSA</a></b><br>
+  Discusses the differences between KJSEmbed and TQSA.</li>
 </ul>
 
 <h3>References</h3>
@@ -88,7 +88,7 @@ who want to write scripts.
   A tutorial on how to implement inheritence in JavaScript.
   </li>
   <li><b><a href="http://doc.trolltech.com/qsa/">Qt Script for Applications Documentation</a></b><br>
-  The documentation for QSA, this is Trolltech's ECMAScript binding
+  The documentation for TQSA, this is Trolltech's ECMAScript binding
   for Qt.
   </li>
 </ul>
diff --git a/kjsembed/docs/kjsembed-qsa.html b/kjsembed/docs/kjsembed-qsa.html
index 2de920d8..9355c268 100644
--- a/kjsembed/docs/kjsembed-qsa.html
+++ b/kjsembed/docs/kjsembed-qsa.html
@@ -1,32 +1,32 @@
 <html>
 <head>
 <link href="kjsembed.css" rel="stylesheet" type="text/css">
-<title>KJSEmbed and QSA</title>
+<title>KJSEmbed and TQSA</title>
 </head>
 <body>
-<h1>KJSEmbed and QSA</h1>
+<h1>KJSEmbed and TQSA</h1>
 <hr>
 
 <h3>Introduction</h3>
 
-There are a lot of similarities between QSA and KJSEmbed, and this has
+There are a lot of similarities between TQSA and KJSEmbed, and this has
 led to some confusion. This document aims to shed some light on the
 differences between the two libraries.
 
 <h3>The Differences</h3>
 
 <ul>
-  <li>QSA has a nice built in script editor which kjsembed does not,
+  <li>TQSA has a nice built in script editor which kjsembed does not,
   but kjsembed can load designers ui files anyway and it would be easy
   to add.</li>
 
   <li>KJSEmbed has facilities for working with KActions and can even
   load them from XML files.</li>
  
-  <li>KJSEmbed makes it easier to operate with Qt types than QSA. Take
+  <li>KJSEmbed makes it easier to operate with Qt types than TQSA. Take
   a look at the <a href="types.html">types documentation</a> for more details.</li>
 
-  <li>KJSEmbed has support for KDE specific types such as KURL. QSA
+  <li>KJSEmbed has support for KDE specific types such as KURL. TQSA
   does not support these types by default, but does provide facilities
   for adding support yourself.</li>
 
@@ -35,7 +35,7 @@ differences between the two libraries.
   available if the host application chooses to publish the DOM to the
   interpreter.</li>
 
-  <li>KJSEmbed is LGPL while QAS is GPL.</li>
+  <li>KJSEmbed is LGPL while TQAS is GPL.</li>
 </ul>
 
 <hr>
diff --git a/kjsembed/docs/tutorial/kjsembed.html b/kjsembed/docs/tutorial/kjsembed.html
index dc769dc3..7e2c38fd 100644
--- a/kjsembed/docs/tutorial/kjsembed.html
+++ b/kjsembed/docs/tutorial/kjsembed.html
@@ -38,7 +38,7 @@ pre {
   been designed with this in mind thanks to a KParts plugin. In addition, KJSEmbed 
   provides a command line tool for running scripts so users can easily create 
   simple applications of their own in Javascript. KJSEmbed scripts are surprisingly 
-  powerful because they access the properties and slots of QObjects, and can even 
+  powerful because they access the properties and slots of TQObjects, and can even 
   load widgets and dialogs created with Qt's graphical dialog editor.</p>
 <h3>Features</h3>
 <p>To give you an idea of what KJSEmbed provides, here is a brief summary of the 
@@ -51,16 +51,16 @@ pre {
     X server if you don't need to display a GUI).</li>
   <li>Define new KActions using XML.</li>
   <li>Scripts can connect signals to slots.</li>
-  <li>Scripts can access the properties and slots of QObjects as if they were 
+  <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 TQWidget subclass supported by TQWidgetFactory.</li>
-  <li>Making your own QObjects/QWidgets available for scripting is one-liner.</li>
+  <li>Scripts can create instances of anu TTQWidget subclass supported by TTQWidgetFactory.</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>
 </ul>
 <h3>First Steps - The Console Dialog</h3>
-<p>The quickest way to see what KJSEmbed can do is with kjscmd, a tool for running 
+<p>The tquickest way to see what KJSEmbed can do is with kjscmd, a tool for running 
   scripts from the command line. To begin, we'll run kjscmd without any parameters 
   which brings up the KJSEmbed console dialog. The console provides an easy way 
   to run short (one line) scripts, as you can see in figure 1 the scripts have 
@@ -88,11 +88,11 @@ JSConsoleWidget (KJSEmbed::JSConsoleWidget)
 kjs> console.childCount()
 4
 kjs> console.child(1)
-CmdEdit (TQComboBox)
+CmdEdit (TTQComboBox)
 kjs> console.child(2)
-RunButton (TQPushButton)
+RunButton (TTQPushButton)
 kjs> console.child(&quot;RunButton&quot;)
-RunButton (TQPushButton)
+RunButton (TTQPushButton)
 kjs> console.child(&quot;RunButton&quot;).text = &quot;Go!&quot;
 Go!
 kjs> console.caption = &quot;Different Title&quot;
@@ -149,12 +149,12 @@ 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 TQLineEdit called 'search_edit', so 
+  entering the text to be searched for is a TTQLineEdit 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 QLineEdits 
+  found the right object getting hold of the text is easy because all TQLineEdits 
   make their contents available as a property called 'text'. The code that gets 
-  the value of the check boxes is almost identical, except that these are QCheckBoxes 
+  the value of the check boxes is almost identical, except that these are TQCheckBoxes 
   so it's the 'checked' property we're interested in.</p>
 <p align="center"><img src="grepdlg.png" alt="Grep Dialog Screenshot" width="327" height="241"></p>
 <p class="imgcaption">Figure 3: The Grep Dialog</p>
diff --git a/kjsembed/docs/tutorial/passwordfileviewdlg.ui b/kjsembed/docs/tutorial/passwordfileviewdlg.ui
index 5ff8c59c..603f7fa2 100644
--- a/kjsembed/docs/tutorial/passwordfileviewdlg.ui
+++ b/kjsembed/docs/tutorial/passwordfileviewdlg.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI>
 <class>password_viewer</class>
 <widget>
-    <class>QDialog</class>
+    <class>TQDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>password_viewer</cstring>
@@ -33,7 +33,7 @@
             <number>6</number>
         </property>
         <widget row="0"  column="0"  rowspan="1"  colspan="2" >
-            <class>QLabel</class>
+            <class>TQLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel1</cstring>
@@ -83,7 +83,7 @@
             </property>
         </spacer>
         <widget row="3"  column="1" >
-            <class>QPushButton</class>
+            <class>TQPushButton</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>PushButton5</cstring>
@@ -94,7 +94,7 @@
             </property>
         </widget>
         <widget row="2"  column="0"  rowspan="1"  colspan="2" >
-            <class>QListView</class>
+            <class>TQListView</class>
             <column>
                 <property>
                     <name>text</name>
diff --git a/kjsembed/docs/types.html b/kjsembed/docs/types.html
index 59701605..ab823896 100644
--- a/kjsembed/docs/types.html
+++ b/kjsembed/docs/types.html
@@ -38,76 +38,76 @@ continue to be supported.
 
 <h3>Strings</h3>
 <ul>
-<li>TQString -> String
-<li>TQCString -> String
+<li>TTQString -> String
+<li>TTQCString -> String
 <li>const char * -> String
-<li>String -> QString
-<li>String -> QCString
+<li>String -> TQString
+<li>String -> TQCString
 <li>String -> const char *
 </ul>
 
 <h2>Qt Object Types</h2>
 
-<h3>TQColor</h3>
+<h3>TTQColor</h3>
 Represents a color, possibly including an alpha channel.
 <ul>
-<li>TQColor -> '#rrggbb'
-<li>'#rrggbb' -> QColor
-<li>'#rrggbbaa' -> QColor
+<li>TTQColor -> '#rrggbb'
+<li>'#rrggbb' -> TQColor
+<li>'#rrggbbaa' -> TQColor
 </ul>
 
-<h3>TQPoint</h3>
+<h3>TTQPoint</h3>
 Represents a point.
 <ul>
-<li>TQPoint -> [x,y]
-<li>[x,y] -> QPoint
-<li>obj.x obj.y -> QPoint
+<li>TTQPoint -> [x,y]
+<li>[x,y] -> TQPoint
+<li>obj.x obj.y -> TQPoint
 </ul>
 
-<h3>TQSize</h3>
+<h3>TTQSize</h3>
 Represents a size.
 <ul>
-<li>TQSize -> [w,h]
-<li>[w,h] -> QSize
-<li>obj.w obj.h -> QSize
+<li>TTQSize -> [w,h]
+<li>[w,h] -> TQSize
+<li>obj.w obj.h -> TQSize
 </ul>
 
-<h3>TQRect</h3>
+<h3>TTQRect</h3>
 Represents a rectangle.
 <ul>
-<li>TQRect -> [x,y,w,h]
-<li>[x,y,w,h] -> QRect
-<li>obj.x obj.y obj.w obj.h -> QRect
+<li>TTQRect -> [x,y,w,h]
+<li>[x,y,w,h] -> TQRect
+<li>obj.x obj.y obj.w obj.h -> TQRect
 </ul>
 
-<h3>TQDate</h3>
+<h3>TTQDate</h3>
 Represents a date.
 <ul>
-<li>TQDate -> ''
+<li>TTQDate -> ''
 </ul>
 
-<h3>TQTime</h3>
+<h3>TTQTime</h3>
 Represents a time.
 <ul>
-<li>TQTime -> ''
+<li>TTQTime -> ''
 </ul>
 
-<h3>TQDateTime</h3>
+<h3>TTQDateTime</h3>
 Represents a date/time pair.
 <ul>
-<li>TQDateTime -> ''
+<li>TTQDateTime -> ''
 </ul>
 
-<h3>TQKeySequence</h3>
+<h3>TTQKeySequence</h3>
 Represents a sequence of keys, eg. it is used for accelerators.
 <ul>
-<li>TQKeySequence -> ''
+<li>TTQKeySequence -> ''
 </ul>
 
-<h3>TQFont</h3>
+<h3>TTQFont</h3>
 Represents a font.
 <ul>
-<li>TQFont -> ''
+<li>TTQFont -> ''
 </ul>
 
 <h2>KDE Object Types</h2>
diff --git a/kjsembed/docs/write_classes.js b/kjsembed/docs/write_classes.js
index ed47578c..ca14231f 100644
--- a/kjsembed/docs/write_classes.js
+++ b/kjsembed/docs/write_classes.js
@@ -14,7 +14,7 @@ text += '<h1>Constructors</h1>\n';
 text += '<hr>\n';
 
 text += 'Object that scripts can create. This list includes objects\n';
-text += 'defined by QWidgetFactory as well as those with custom bindings.\n';
+text += 'defined by TQWidgetFactory as well as those with custom bindings.\n';
 text += '<ul>\n';
 
 
diff --git a/kjsembed/doxygen_fakes.h b/kjsembed/doxygen_fakes.h
index 676d2496..16c3c76b 100644
--- a/kjsembed/doxygen_fakes.h
+++ b/kjsembed/doxygen_fakes.h
@@ -1,17 +1,17 @@
 
 /** An object that supports signals and slots. */
-class TQObject {};
+class TTQObject {};
 /** Base-class of all widgets. */
-class TQWidget : public TQObject {};
+class TTQWidget : public TTQObject {};
 /** A widget that has a frame. */
-class TQFrame : public TQWidget {};
+class TTQFrame : public TTQWidget {};
 
 /** Namespace for the KParts framework. */
 namespace KParts {
     /** A base-class for plugins that extend a KPart. */
-    class Plugin : public TQObject, public XMLGUIClient {};
+    class Plugin : public TTQObject, public XMLGUIClient {};
     /** A base-class for KParts. */
-    class Part : public TQObject, public XMLGUIClient {};
+    class Part : public TTQObject, 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 4d6937cb..f48a9384 100644
--- a/kjsembed/global.cpp
+++ b/kjsembed/global.cpp
@@ -32,9 +32,9 @@
 # endif
 #endif
 
-static TQTextStream *kjsembed_err = 0L;
-static TQTextStream *kjsembed_in = 0L;
-static TQTextStream *kjsembed_out = 0L;
+static TTQTextStream *kjsembed_err = 0L;
+static TTQTextStream *kjsembed_in = 0L;
+static TTQTextStream *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 TQFile win32_stdin;
-static TQFile win32_stdout;
-static TQFile win32_stderr;
+static TTQFile win32_stdin;
+static TTQFile win32_stdout;
+static TTQFile win32_stderr;
 
 static const WORD MAX_CONSOLE_LINES = 500;
 
@@ -102,23 +102,23 @@ void RedirectIOToConsole() {
 #endif
 
 
-TQTextStream &consoleOut(  )
+TTQTextStream &consoleOut(  )
 {
    return *KJSEmbed::conout();
 }
 
-TQTextStream &consoleError( )
+TTQTextStream &consoleError( )
 {
    return *KJSEmbed::conerr();
 }
 
-TQTextStream &consoleIn( )
+TTQTextStream &consoleIn( )
 {
    return *KJSEmbed::conin();
 }
 
 #ifdef QT_ONLY
-TQTextStream &kdDebug( int area )
+TTQTextStream &kdDebug( int area )
 {
 #ifndef QT_DEBUG
    return consoleError() << "DEBUG: (" << area << ") ";
@@ -128,50 +128,50 @@ TQTextStream &kdDebug( int area )
 
 }
 
-TQTextStream &kdWarning( int area )
+TTQTextStream &kdWarning( int area )
 {
    return consoleOut() << "WARNING: (" << area << ") ";
 }
 
-TQString i18n( const char *string )
+TTQString i18n( const char *string )
 {
-	return TQObject::tr( string, "qjsembed string");
+	return TTQObject::tr( string, "qjsembed string");
 }
 
 #endif
 
-TQTextStream *KJSEmbed::conin()
+TTQTextStream *KJSEmbed::conin()
 {
    if ( !kjsembed_in ) {
 #ifdef _WIN32
-	   kjsembed_in = new TQTextStream( &win32_stdin );
+	   kjsembed_in = new TTQTextStream( &win32_stdin );
 #else
-	   kjsembed_in = new TQTextStream( stdin, IO_ReadOnly );
+	   kjsembed_in = new TTQTextStream( stdin, IO_ReadOnly );
 #endif
    }
    return kjsembed_in;
 }
 
-TQTextStream *KJSEmbed::conout()
+TTQTextStream *KJSEmbed::conout()
 {
    if ( !kjsembed_out ) {
 #ifdef _WIN32
-	   kjsembed_out = new TQTextStream( &win32_stdout  );
+	   kjsembed_out = new TTQTextStream( &win32_stdout  );
 #else
-	   kjsembed_out = new TQTextStream( stdout, IO_WriteOnly );
+	   kjsembed_out = new TTQTextStream( stdout, IO_WriteOnly );
 #endif
    }
    return kjsembed_out;
 
 }
 
-TQTextStream *KJSEmbed::conerr()
+TTQTextStream *KJSEmbed::conerr()
 {
    if ( !kjsembed_err ) {
 #ifdef _WIN32
-	   kjsembed_err = new TQTextStream( &win32_stderr  );
+	   kjsembed_err = new TTQTextStream( &win32_stderr  );
 #else
-	   kjsembed_err = new TQTextStream( stderr, IO_WriteOnly );
+	   kjsembed_err = new TTQTextStream( stderr, IO_WriteOnly );
 #endif
    }
    return kjsembed_err;
diff --git a/kjsembed/global.h b/kjsembed/global.h
index e2e4a652..1c4a2210 100644
--- a/kjsembed/global.h
+++ b/kjsembed/global.h
@@ -55,9 +55,9 @@ char *itoa(int num, char *str, int radix = 10);
 
 #include <tqtextstream.h>
 namespace KJSEmbed {
-KJSEMBED_EXPORT TQTextStream *conin();
-KJSEMBED_EXPORT TQTextStream *conout();
-KJSEMBED_EXPORT TQTextStream *conerr();
+KJSEMBED_EXPORT TTQTextStream *conin();
+KJSEMBED_EXPORT TTQTextStream *conout();
+KJSEMBED_EXPORT TTQTextStream *conerr();
 }
 
 #ifndef QT_ONLY
@@ -75,13 +75,13 @@ KJSEMBED_EXPORT TQTextStream *conerr();
  * These are the custom definitions used when we only have Qt.
  */
 
-KJSEMBED_EXPORT TQTextStream &kdDebug( int area=0 );
-KJSEMBED_EXPORT TQTextStream &kdWarning( int area=0 );
+KJSEMBED_EXPORT TTQTextStream &kdDebug( int area=0 );
+KJSEMBED_EXPORT TTQTextStream &kdWarning( int area=0 );
 
 #ifndef NO_I18N
-KJSEMBED_EXPORT TQString i18n( const char *string );
+KJSEMBED_EXPORT TTQString i18n( const char *string );
 #else
-#define i18n(x) TQString(x)
+#define i18n(x) TTQString(x)
 #endif // NO_I18N
 
 #endif // QT_ONLY
diff --git a/kjsembed/jsbinding.cpp b/kjsembed/jsbinding.cpp
index 7abddf2c..5d8e4a14 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, TQValueList<TQVariant>
+    // Rect, Size, Point, Pixmap, Image, Brush, Pen, Size, Rect, Point, TTQValueList<TTQVariant>
     //
     // Opqaue
     // ======
@@ -51,7 +51,7 @@ namespace KJSEmbed {
     // ByteArray, BitArray
     //
 
-    KJS::Value convertToValue( KJS::ExecState *exec, const TQVariant &val ) {
+    KJS::Value convertToValue( KJS::ExecState *exec, const TTQVariant &val ) {
         if ( !val.isValid() )
             return KJS::Undefined();
 
@@ -61,23 +61,23 @@ namespace KJSEmbed {
 
         switch( type )
         {
-            case TQVariant::String:
-            case TQVariant::CString:
+            case TTQVariant::String:
+            case TTQVariant::CString:
                 return KJS::String( val.toString() );
                 break;
-            case TQVariant::Int:
+            case TTQVariant::Int:
                 return KJS::Number( val.toInt() );
                 break;
-            case TQVariant::UInt:
+            case TTQVariant::UInt:
                 return KJS::Number( val.toUInt() );
                 break;
-            case TQVariant::Double:
+            case TTQVariant::Double:
                 return KJS::Number( val.toDouble() );
                 break;
-            case TQVariant::Bool:
+            case TTQVariant::Bool:
                 return KJS::Boolean( val.toBool() );
                 break;
-            case TQVariant::Rect:
+            case TTQVariant::Rect:
             {
                 JSValueProxy * prx = new JSValueProxy( );
                 prx->setValue( val );
@@ -86,14 +86,14 @@ namespace KJSEmbed {
                 return proxyObj;
                 break;
             }
-            case TQVariant::Date:
-            case TQVariant::DateTime:
-            case TQVariant::Time:
+            case TTQVariant::Date:
+            case TTQVariant::DateTime:
+            case TTQVariant::Time:
             {
-                TQDateTime dt = TQDateTime::currentDateTime();
-                if ( type == TQVariant::Date )
+                TTQDateTime dt = TTQDateTime::currentDateTime();
+                if ( type == TTQVariant::Date )
                     dt.setDate( val.toDate() );
-                else if ( type == TQVariant::Time )
+                else if ( type == TTQVariant::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 TQVariant::Point:
+            case TTQVariant::Point:
             {
                 JSValueProxy * prx = new JSValueProxy( );
                 prx->setValue( val );
@@ -116,37 +116,37 @@ namespace KJSEmbed {
                 return proxyObj;
                 break;
             }
-            case TQVariant::StringList:
+            case TTQVariant::StringList:
             {
-                TQStringList lst = val.toStringList();
-                TQStringList::Iterator idx = lst.begin();
+                TTQStringList lst = val.toStringList();
+                TTQStringList::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 TQVariant::List:
-//            case TQVariant::StringList:  
-// This will cause an extra conversion step for a QStrinList so use the above case.
+            case TTQVariant::List:
+//            case TTQVariant::StringList:  
+// This will cause an extra conversion step for a TQStrinList so use the above case.
             {
-                TQValueList<TQVariant> lst = val.toList();
-                TQValueList<TQVariant>::Iterator idx = lst.begin();
+                TTQValueList<TTQVariant> lst = val.toList();
+                TTQValueList<TTQVariant>::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 TQVariant::Map:
+            case TTQVariant::Map:
             {
-                TQMap<TQString,TQVariant> map = val.toMap();
-                TQMap<TQString,TQVariant>::Iterator idx = map.begin();
+                TTQMap<TTQString,TTQVariant> map = val.toMap();
+                TTQMap<TTQString,TTQVariant>::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 TQVariant::Pixmap:
+            case TTQVariant::Pixmap:
             {
                 JSValueProxy * prx = new JSValueProxy( );
                 prx->setValue( val );
@@ -155,7 +155,7 @@ namespace KJSEmbed {
                 return proxyObj;
                 break;
             }
-            case TQVariant::Brush:
+            case TTQVariant::Brush:
             {
                 JSValueProxy * prx = new JSValueProxy( );
                 prx->setValue( val );
@@ -163,7 +163,7 @@ namespace KJSEmbed {
                 Bindings::BrushImp::addBindings( exec, proxyObj );
                 return proxyObj;
             }
-            case TQVariant::Image:
+            case TTQVariant::Image:
             {
                 JSValueProxy * prx = new JSValueProxy( );
                 prx->setValue( val );
@@ -172,7 +172,7 @@ namespace KJSEmbed {
                 return proxyObj;
                 break;
             }
-            case TQVariant::Pen:
+            case TTQVariant::Pen:
             {
                 JSValueProxy * prx = new JSValueProxy( );
                 prx->setValue( val );
@@ -181,7 +181,7 @@ namespace KJSEmbed {
                 return proxyObj;
                 break;
             }
-            case TQVariant::Size:
+            case TTQVariant::Size:
             {
                 JSValueProxy * prx = new JSValueProxy( );
                 prx->setValue( val );
@@ -192,7 +192,7 @@ namespace KJSEmbed {
             }
             default:
             {
-                if ( val.canCast( TQVariant::String ) )
+                if ( val.canCast( TTQVariant::String ) )
                     return KJS::String( val.toString() );
                 else
                 {
@@ -209,8 +209,8 @@ namespace KJSEmbed {
         }
     }
 
-    TQVariant convertToVariant( KJS::ExecState *exec, const KJS::Value &v ) {
-        TQVariant val;
+    TTQVariant convertToVariant( KJS::ExecState *exec, const KJS::Value &v ) {
+        TTQVariant 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 ) {
                     
-		          TQObject * o = prx->object();
-                        TQCString cs( o ? o->className() : "" );
+		          TTQObject * o = prx->object();
+                        TTQCString cs( o ? o->className() : "" );
                         if ( obj.implementsConstruct() )
-                            val = TQString( "new %1();" ).arg( obj.className().qstring() );
+                            val = TTQString( "new %1();" ).arg( obj.className().qstring() );
                         else if ( obj.implementsCall() )
-                            val = TQString( "%1(...);" ).arg( obj.className().qstring() );
+                            val = TTQString( "%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 TQMap<TQString,TQVariant>
+		    } else {  // Last resort map the object to a TTQMap<TTQString,TTQVariant>
 		      kdDebug( 80001 ) << "convertToVariant() map to struct." << endl;
 		      val = convertArrayToMap(exec, v);
                     }
@@ -276,7 +276,7 @@ namespace KJSEmbed {
             }
             default:
             {
-                TQString msg = i18n( "Unsupported KJS::Value, type %1" ).arg( ( int ) v.type() );
+                TTQString 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;
     }
 
-    TQStringList dumpCompletion( KJS::ExecState *exec, KJS::Object &obj ) {
-        TQStringList returnList;
+    TTQStringList dumpCompletion( KJS::ExecState *exec, KJS::Object &obj ) {
+        TTQStringList 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 );
-                TQString nm( name.ustring().qstring() );
-                TQString vl;
+                TTQString nm( name.ustring().qstring() );
+                TTQString vl;
 
                 if ( vobj.implementsConstruct() ) {
                     if ( vobj.prototype().toString( exec ).qstring() == "[function]" )
-                        returnList << TQString( "%1(...)" ).arg( nm );
+                        returnList << TTQString( "%1(...)" ).arg( nm );
                 } else if ( vobj.implementsCall() ) {
-                    returnList << TQString( "%1(...)" ).arg( nm );
+                    returnList << TTQString( "%1(...)" ).arg( nm );
                 } else {
-                    TQVariant val = convertToVariant( exec, v );
+                    TTQVariant val = convertToVariant( exec, v );
                     vl = val.toString();
                     returnList << nm;
                 }
@@ -319,17 +319,17 @@ namespace KJSEmbed {
         }
 
         JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() );
-        TQObject *qo = proxy ? proxy->object() : 0;
-        TQMetaObject *mo = qo ? qo->metaObject() : 0;
+        TTQObject *qo = proxy ? proxy->object() : 0;
+        TTQMetaObject *mo = qo ? qo->metaObject() : 0;
 
-        // QObject
+        // TQObject
         if ( proxy ) {
 
-            // QProperties
-            TQStrList propList( mo->propertyNames( true ) );
-            for ( TQStrListIterator iter1( propList ); iter1.current(); ++iter1 ) {
+            // TQProperties
+            TTQStrList propList( mo->propertyNames( true ) );
+            for ( TTQStrListIterator iter1( propList ); iter1.current(); ++iter1 ) {
 
-                TQCString name = iter1.current();
+                TTQCString name = iter1.current();
                 int propid = mo->findProperty( name.data(), true );
                 if ( propid == -1 )
                     continue;
@@ -338,11 +338,11 @@ namespace KJSEmbed {
 
             // Slots
             KJS::List items;
-            TQStrList slotList( mo->slotNames( true ) );
+            TTQStrList slotList( mo->slotNames( true ) );
 
-            for ( TQStrListIterator iter2( slotList ); iter2.current(); ++iter2 ) {
-                TQCString name = iter2.current();
-                TQString nm( name );
+            for ( TTQStrListIterator iter2( slotList ); iter2.current(); ++iter2 ) {
+                TTQCString name = iter2.current();
+                TTQString nm( name );
 
                 int slotid = mo->findSlot( name.data(), true );
                 if ( slotid != -1 ) {
@@ -353,12 +353,12 @@ namespace KJSEmbed {
         return returnList;
     }
 
-    TQString dumpObject( KJS::ExecState *exec, KJS::Object &obj ) {
+    TTQString dumpObject( KJS::ExecState *exec, KJS::Object &obj ) {
         if ( !obj.isValid() )
-            return TQString( "Invalid object\n" );
+            return TTQString( "Invalid object\n" );
 
-        TQStringList properties;
-        TQStringList methods;
+        TTQStringList properties;
+        TTQStringList 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 );
-                TQString nm( name.ustring().qstring() );
+                TTQString nm( name.ustring().qstring() );
 
                 kdDebug( 80001 ) << "Getting: " << name.ustring().qstring() << " "
                 << vobj.prototype().toString( exec ).qstring() << endl;
@@ -392,21 +392,21 @@ namespace KJSEmbed {
             propIt++;
         }
 
-        TQString s;
+        TTQString s;
 
         // JS properties
-        s += TQString( "<h2>Properties</h2>\n" );
+        s += TTQString( "<h2>Properties</h2>\n" );
 
         if ( !properties.isEmpty() ) {
             s += "<table width=\"90%\">\n";
             s += "<tr><th>Type</th><th>Name</th><th>Value</th></tr>\n";
 
             properties.sort();
-            for ( TQStringList::Iterator iter = properties.begin(); iter != properties.end(); ++iter ) {
+            for ( TTQStringList::Iterator iter = properties.begin(); iter != properties.end(); ++iter ) {
 		KJS::Value v = obj.get( exec, KJS::Identifier( KJS::UString( *iter ) ) );
-                TQVariant val = convertToVariant( exec, v );
+                TTQVariant val = convertToVariant( exec, v );
 
-                s += TQString( "<tr><td align=\"center\">%1</td><td><b>%2</b></td><td align=\"center\">%3</td></tr>\n" )
+                s += TTQString( "<tr><td align=\"center\">%1</td><td><b>%2</b></td><td align=\"center\">%3</td></tr>\n" )
                      .arg( val.typeName() ).arg( *iter ).arg( val.toString() );
             }
 
@@ -415,12 +415,12 @@ namespace KJSEmbed {
             s += "<i>None</i>\n";
 
         // Methods
-        s += TQString( "<h2>Methods</h2>\n" );
+        s += TTQString( "<h2>Methods</h2>\n" );
 
         if ( !methods.isEmpty() ) {
             s += "<table width=\"90%\">";
             methods.sort();
-            for ( TQStringList::Iterator iter = methods.begin(); iter != methods.end(); ++iter ) {
+            for ( TTQStringList::Iterator iter = methods.begin(); iter != methods.end(); ++iter ) {
                 s += "<tr><td><b>";
                 s += *iter;
                 s += "(...)</b></td></tr>";
@@ -429,26 +429,26 @@ namespace KJSEmbed {
         } else
             s += "<i>None</i>\n";
 
-        s += dumpQObject( exec, obj );
+        s += dumpTQObject( exec, obj );
         return s;
     }
 
-    TQString dumpQObject( KJS::ExecState * /*exec*/, KJS::Object &obj ) {
+    TTQString dumpTQObject( KJS::ExecState * /*exec*/, KJS::Object &obj ) {
         if ( !obj.isValid() )
-            return TQString( "Invalid object\n" );
+            return TTQString( "Invalid object\n" );
 
-        TQString s( "" );
+        TTQString s( "" );
         JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() );
-        TQObject *qo = proxy ? proxy->object() : 0;
-        TQMetaObject *mo = qo ? qo->metaObject() : 0;
+        TTQObject *qo = proxy ? proxy->object() : 0;
+        TTQMetaObject *mo = qo ? qo->metaObject() : 0;
 
-        // QObject
+        // TQObject
         if ( proxy ) {
 
-            // QProperties
-            s += TQString( "<h2>Qt Properties</h2>\n" );
+            // TQProperties
+            s += TTQString( "<h2>Qt Properties</h2>\n" );
 
-            TQStrList propList( mo->propertyNames( true ) );
+            TTQStrList propList( mo->propertyNames( true ) );
 
             if ( !propList.isEmpty() ) {
 
@@ -456,15 +456,15 @@ namespace KJSEmbed {
                 s += "<tr><th>Type</th><th>Name</th><th>Value</th></tr>\n";
 
                 propList.sort();
-                for ( TQStrListIterator iter( propList ); iter.current(); ++iter ) {
+                for ( TTQStrListIterator iter( propList ); iter.current(); ++iter ) {
 
-                    TQCString name = iter.current();
+                    TTQCString name = iter.current();
                     int propid = mo->findProperty( name.data(), true );
                     if ( propid == -1 )
                         continue;
 
-                    TQVariant vl = qo->property( name.data() );
-                    s += TQString( "<tr><td align=\"center\">%1</td><td><b>%2</b></td><td align=\"center\">%3</td></tr>\n" )
+                    TTQVariant vl = qo->property( name.data() );
+                    s += TTQString( "<tr><td align=\"center\">%1</td><td><b>%2</b></td><td align=\"center\">%3</td></tr>\n" )
                          .arg( mo->property( propid, true ) ->type() ).arg( name ).arg( vl.toString() );
                 }
 
@@ -474,20 +474,20 @@ namespace KJSEmbed {
             }
 
             // Signals
-            s += TQString( "<h2>Qt Signals</h2>\n" );
+            s += TTQString( "<h2>Qt Signals</h2>\n" );
             s += "<table width=\"90%\">";
 
-            TQStrList signalList( mo->signalNames( true ) );
+            TTQStrList signalList( mo->signalNames( true ) );
             signalList.sort();
 
-            for ( TQStrListIterator iter1( signalList ); iter1.current(); ++iter1 ) {
+            for ( TTQStrListIterator iter1( signalList ); iter1.current(); ++iter1 ) {
 
-                TQCString name = iter1.current();
-                TQString nm( name );
+                TTQCString name = iter1.current();
+                TTQString nm( name );
 
                 int signalid = mo->findSignal( name.data(), true );
                 if ( signalid != -1 )
-                    s += TQString( "<tr><td><b>%1</b></td></tr>\n" ).arg( nm );
+                    s += TTQString( "<tr><td><b>%1</b></td></tr>\n" ).arg( nm );
             }
 
             s += "</table>";
@@ -495,33 +495,33 @@ namespace KJSEmbed {
                 s += "<i>None</i>";
 
             // Slots
-            s += TQString( "<h2>Qt Slots</h2>\n" );
+            s += TTQString( "<h2>Qt Slots</h2>\n" );
             s += "<table width=\"90%\">";
 
             KJS::List items;
-            TQStrList slotList( mo->slotNames( true ) );
+            TTQStrList slotList( mo->slotNames( true ) );
             slotList.sort();
 
-            for ( TQStrListIterator iter2( slotList ); iter2.current(); ++iter2 ) {
+            for ( TTQStrListIterator iter2( slotList ); iter2.current(); ++iter2 ) {
 
-                TQCString name = iter2.current();
-                TQString nm( name );
+                TTQCString name = iter2.current();
+                TTQString nm( name );
 
                 int slotid = mo->findSlot( name.data(), true );
                 if ( slotid != -1 ) {
-                    const QMetaData * md = mo->slot( slotid, true );
-                    const QUMethod *method = md->method;
-                    if ( method->count && ( method->parameters->inOut == QUParameter::Out ) ) {
-                        TQCString typenm( method->parameters->type->desc() );
+                    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() );
                         if ( typenm == "ptr" ) {
-                            s += TQString( "<tr><td>%1</td><td><b>%2</b></td></tr>\n" )
+                            s += TTQString( "<tr><td>%1</td><td><b>%2</b></td></tr>\n" )
                                  .arg( ( const char * ) method->parameters->typeExtra ).arg( nm );
                         } else {
-                            s += TQString( "<tr><td>%1</td><td><b>%2</b></td></tr>\n" )
+                            s += TTQString( "<tr><td>%1</td><td><b>%2</b></td></tr>\n" )
                                  .arg( typenm.data() ).arg( nm );
                         }
                     } else
-                        s += TQString( "<tr><td>void</td><td><b>%1</b></td></tr>\n" ).arg( nm );
+                        s += TTQString( "<tr><td>void</td><td><b>%1</b></td></tr>\n" ).arg( nm );
                 }
             }
 
@@ -535,44 +535,44 @@ namespace KJSEmbed {
 
 
 
-    TQPen extractQPen( KJS::ExecState *exec, const KJS::List &args, int idx ) {
-        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPen() : TQPen();
+    TTQPen extractTQPen( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPen() : TTQPen();
     }
 
-    TQBrush extractQBrush( KJS::ExecState *exec, const KJS::List &args, int idx ) {
-        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toBrush() : TQBrush();
+    TTQBrush extractTQBrush( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toBrush() : TTQBrush();
     }
 
-    TQFont extractQFont( KJS::ExecState *exec, const KJS::List &args, int idx ) {
-        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toFont() : TQFont();
+    TTQFont extractTQFont( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toFont() : TTQFont();
     }
 
-    TQPixmap extractQPixmap( KJS::ExecState *exec, const KJS::List &args, int idx ) {
-        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPixmap() : TQPixmap();
+    TTQPixmap extractTQPixmap( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPixmap() : TTQPixmap();
     }
 
-    TQImage extractQImage( KJS::ExecState *exec, const KJS::List &args, int idx ) {
-        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toImage() : TQImage();
+    TTQImage extractTQImage( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toImage() : TTQImage();
     }
 
-    TQPalette extractQPalette( KJS::ExecState *exec, const KJS::List &args, int idx ) {
-        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPalette() : TQPalette();
+    TTQPalette extractTQPalette( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPalette() : TTQPalette();
     }
 
-    TQString extractQString( KJS::ExecState *exec, const KJS::List &args, int idx ) {
-        return ( args.size() > idx ) ? args[ idx ].toString( exec ).qstring() : TQString::null;
+    TTQString extractTQString( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+        return ( args.size() > idx ) ? args[ idx ].toString( exec ).qstring() : TTQString::null;
     }
 
     int extractInt( KJS::ExecState *exec, const KJS::List &args, int idx ) {
         return ( args.size() > idx ) ? args[ idx ].toInteger( exec ) : 0;
     }
 
-    TQColor extractQColor( KJS::ExecState *exec, const KJS::List &args, int idx ) {
-        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toColor() : TQColor();
+    TTQColor extractTQColor( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toColor() : TTQColor();
     }
 
-    TQSize extractQSize( KJS::ExecState *exec, const KJS::List &args, int idx ) {
-        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toSize() : TQSize();
+    TTQSize extractTQSize( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toSize() : TTQSize();
     }
 
     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;
     }
 
-    TQStringList extractQStringList( KJS::ExecState *exec, const KJS::List &args, int idx ) {
-        return ( args.size() > idx ) ? convertArrayToStringList( exec, args[ idx ] ) : TQStringList();
+    TTQStringList extractTQStringList( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+        return ( args.size() > idx ) ? convertArrayToStringList( exec, args[ idx ] ) : TTQStringList();
     }
 
     /**
@@ -628,8 +628,8 @@ namespace KJSEmbed {
             return None;
     }
 
-    TQMap<TQString, TQVariant> convertArrayToMap( KJS::ExecState *exec, const KJS::Value &value ) {
-        TQMap<TQString, TQVariant> returnMap;
+    TTQMap<TTQString, TTQVariant> convertArrayToMap( KJS::ExecState *exec, const KJS::Value &value ) {
+        TTQMap<TTQString, TTQVariant> 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;
     }
 
-    TQValueList<TQVariant> convertArrayToList( KJS::ExecState *exec, const KJS::Value &value ) {
-        TQValueList<TQVariant> returnList;
+    TTQValueList<TTQVariant> convertArrayToList( KJS::ExecState *exec, const KJS::Value &value ) {
+        TTQValueList<TTQVariant> 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;
     }
 
-    TQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value ) {
-        TQStringList returnList;
+    TTQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value ) {
+        TTQStringList 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;
     }
 /*
-    TQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value ) {
-        TQStringList returnList;
+    TTQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value ) {
+        TTQStringList returnList;
         KJS::Object obj = value.toObject( exec );
 
         if ( obj.className().qstring() == "Array" ) {
@@ -693,9 +693,9 @@ namespace KJSEmbed {
         return returnList;
     }
 */
-    TQDateTime convertDateToDateTime( KJS::ExecState *exec, const KJS::Value &value ) {
+    TTQDateTime convertDateToDateTime( KJS::ExecState *exec, const KJS::Value &value ) {
         KJS::List args;
-        TQDateTime returnDateTime;
+        TTQDateTime 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( TQDate( year, month + 1, day ) );
-            returnDateTime.setTime( TQTime( hours, minutes, seconds ) );
+            returnDateTime.setDate( TTQDate( year, month + 1, day ) );
+            returnDateTime.setTime( TTQTime( hours, minutes, seconds ) );
         } else {
             kdWarning() << "convertDateToDateTime() received a " << obj.className().qstring() << " instead of a Date" << endl;
         }
@@ -715,32 +715,32 @@ namespace KJSEmbed {
         return returnDateTime;
     }
 
-    TQDateTime extractQDateTime( KJS::ExecState * exec, const KJS::List & args, int idx ) {
-        return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ) : TQDateTime();
+    TTQDateTime extractTQDateTime( KJS::ExecState * exec, const KJS::List & args, int idx ) {
+        return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ) : TTQDateTime();
     }
 
-    TQDate extractQDate( KJS::ExecState * exec, const KJS::List & args, int idx ) {
-        return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ).date() : TQDate();
+    TTQDate extractTQDate( KJS::ExecState * exec, const KJS::List & args, int idx ) {
+        return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ).date() : TTQDate();
     }
 
-    TQTime extractQTime( KJS::ExecState * exec, const KJS::List & args, int idx ) {
-        return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ).time() : TQTime();
+    TTQTime extractTQTime( KJS::ExecState * exec, const KJS::List & args, int idx ) {
+        return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ).time() : TTQTime();
     }
 
-    TQRect extractQRect( KJS::ExecState * exec, const KJS::List & args, int idx ) {
-        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toRect() : TQRect();
+    TTQRect extractTQRect( KJS::ExecState * exec, const KJS::List & args, int idx ) {
+        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toRect() : TTQRect();
     }
 
-    TQPoint extractQPoint( KJS::ExecState * exec, const KJS::List & args, int idx ) {
-        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPoint() : TQPoint();
+    TTQPoint extractTQPoint( KJS::ExecState * exec, const KJS::List & args, int idx ) {
+        return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPoint() : TTQPoint();
     }
 
-    TQStrList extractQStrList( KJS::ExecState *exec, const KJS::List &args, int idx ) {
-        return ( args.size() > idx ) ? convertArrayToStrList( exec, args[ idx ] ) : TQStrList();
+    TTQStrList extractTQStrList( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+        return ( args.size() > idx ) ? convertArrayToStrList( exec, args[ idx ] ) : TTQStrList();
     }
 
-    TQStrList convertArrayToStrList( KJS::ExecState *exec, const KJS::Value &value ) {
-        TQStrList returnList;
+    TTQStrList convertArrayToStrList( KJS::ExecState *exec, const KJS::Value &value ) {
+        TTQStrList returnList;
         KJS::Object obj = value.toObject( exec );
 
         if ( obj.className().qstring() == "Array" ) {
@@ -753,7 +753,7 @@ namespace KJSEmbed {
         return returnList;
     }
 
-    TQObject *extractQObject( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+    TTQObject *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 {
 
     }
 
-    TQWidget *extractQWidget( KJS::ExecState *exec, const KJS::List &args, int idx ) {
+    TTQWidget *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 TQString &error, KJS::ErrorType type )
+    KJS::Object throwError( KJS::ExecState *exec, const TTQString &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 cd79cdc7..1f696be6 100644
--- a/kjsembed/jsbinding.h
+++ b/kjsembed/jsbinding.h
@@ -31,14 +31,14 @@
 #include <kjs/types.h>
 
 /**
- * Implement QString-KJS::UString conversion methods. These methods are declared
+ * Implement TQString-KJS::UString conversion methods. These methods are declared
  * by KJS, but libkjs doesn't actually contain their implementations.
  *
  * @version $Id$
  */
 namespace KJS {
 
-    inline UString::UString( const TQString &d )
+    inline UString::UString( const TTQString &d )
     {
 	uint len = d.length();
 	UChar *dat = new UChar[len];
@@ -46,19 +46,19 @@ namespace KJS {
 	rep = UString::Rep::create(dat, len);
     }
 
-    inline TQString UString::qstring() const
+    inline TTQString UString::qstring() const
     {
-	return TQString((TQChar*) data(), size());
+	return TTQString((TTQChar*) data(), size());
     }
 
-    inline TQConstString UString::qconststring() const
+    inline TTQConstString UString::qconststring() const
     {
-	return TQConstString((TQChar*) data(), size());
+	return TTQConstString((TTQChar*) data(), size());
     }
 
-    inline TQString Identifier::qstring() const
+    inline TTQString Identifier::qstring() const
     {
-	return TQString((TQChar*) data(), size());
+	return TTQString((TTQChar*) data(), size());
     }
 
 }
@@ -71,64 +71,64 @@ namespace KJSEmbed {
 
     KJSEMBED_EXPORT JavaScriptArrayType checkArray( KJS::ExecState *exec, const KJS::Value &val );
 
-    /** Converts a TQVariant to the closest possible KJS::Value. */
-    KJSEMBED_EXPORT KJS::Value convertToValue( KJS::ExecState *exec, const TQVariant &val);
+    /** Converts a TTQVariant to the closest possible KJS::Value. */
+    KJSEMBED_EXPORT KJS::Value convertToValue( KJS::ExecState *exec, const TTQVariant &val);
 
-    /** Converts a KJS::Value to the closest possible TQVariant. */
-    KJSEMBED_EXPORT TQVariant convertToVariant( KJS::ExecState *exec, const KJS::Value &v );
+    /** Converts a KJS::Value to the closest possible TTQVariant. */
+    KJSEMBED_EXPORT TTQVariant convertToVariant( KJS::ExecState *exec, const KJS::Value &v );
 
     /** Returns HTML that documents the specified object. */
-    KJSEMBED_EXPORT TQString dumpObject( KJS::ExecState *exec, KJS::Object &obj );
+    KJSEMBED_EXPORT TTQString dumpObject( KJS::ExecState *exec, KJS::Object &obj );
 
-    /** Returns HTML that documents the TQObject facilities of the specified object. */
-    KJSEMBED_EXPORT TQString dumpQObject( 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 a TQStringList that contains all possible properties,
+    /** Returns a TTQStringList that contains all possible properties,
     * methods and slots for use with a completion object
     */
-    KJSEMBED_EXPORT TQStringList dumpCompletion( KJS::ExecState *exec, KJS::Object &obj);
-
-    KJSEMBED_EXPORT TQPen extractQPen(KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQFont extractQFont(KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQBrush extractQBrush(KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQPalette extractQPalette(KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQPixmap extractQPixmap( KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQImage extractQImage( KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQString extractQString( KJS::ExecState *exec, const KJS::List &args, int idx);
+    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 int extractInt( KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQColor extractQColor(KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQSize extractQSize(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 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 TQStringList extractQStringList(KJS::ExecState *exec, const KJS::List &args, int idx);
+    KJSEMBED_EXPORT TTQStringList extractTQStringList(KJS::ExecState *exec, const KJS::List &args, int idx);
 
-    KJSEMBED_EXPORT TQDateTime extractQDateTime(KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQDate extractQDate(KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQTime extractQTime(KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQRect extractQRect(KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQPoint extractQPoint(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 TQFont extractQFont(KJS::ExecState *exec, const KJS::List &args, int idx);
-    KJSEMBED_EXPORT TQStrList extractQStrList(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 TQObject *extractQObject( KJS::ExecState *exec, const KJS::List &args, int idx );
-    KJSEMBED_EXPORT TQWidget *extractQWidget( 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 JSOpaqueProxy *extractOpaqueProxy( KJS::ExecState *exec, const KJS::List &args, int idx );
 
     // Helpers for Variant conversions....
-    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<TQVariant> convertArrayToList( KJS::ExecState *exec, const KJS::Value &value );
-    KJSEMBED_EXPORT TQMap<TQString, TQVariant> convertArrayToMap( KJS::ExecState *exec, const KJS::Value &value );
+    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<TTQVariant> convertArrayToList( KJS::ExecState *exec, const KJS::Value &value );
+    KJSEMBED_EXPORT TTQMap<TTQString, TTQVariant> 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 TQString &error, KJS::ErrorType type = KJS::GeneralError );
+    KJS::Object throwError( KJS::ExecState *exec, const TTQString &error, KJS::ErrorType type = KJS::GeneralError );
 }
 
 #endif // KJSEMBEDJSBINDING_H
diff --git a/kjsembed/jsbindingbase.h b/kjsembed/jsbindingbase.h
index cca40fc3..83f05c06 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 TQObject binding,
+             * Plugin developers will want to use this method to create their TTQObject 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 4edacf5e..1f04e78a 100644
--- a/kjsembed/jsbindingplugin.cpp
+++ b/kjsembed/jsbindingplugin.cpp
@@ -26,7 +26,7 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-JSBindingPlugin::JSBindingPlugin(  TQObject *parent, const char *name, const TQStringList &/*args*/ ): TQObject(parent,name)
+JSBindingPlugin::JSBindingPlugin(  TTQObject *parent, const char *name, const TTQStringList &/*args*/ ): TTQObject(parent,name)
 {
 
 }
diff --git a/kjsembed/jsbindingplugin.h b/kjsembed/jsbindingplugin.h
index fb7d6361..6d54a508 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 TQObject {
+        class KJSEMBED_EXPORT JSBindingPlugin : public TTQObject {
             Q_OBJECT
         public:
-            JSBindingPlugin( TQObject *parent, const char *name, const TQStringList &args );
+            JSBindingPlugin( TTQObject *parent, const char *name, const TTQStringList &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 TQObject binding,
+             * Plugin developers will want to use this method to create their TTQObject 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 8a54cabf..19b4e42f 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 TQString &p )
+JSBuiltInImp::JSBuiltInImp( JSBuiltIn *builtin, int mid, const TTQString &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 )
 {
-    TQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TQString::null;
-    TQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TTQString::null;
+    TTQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TTQString::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 {
-	    TQString msg = i18n( "Method requires 1 or 2 arguments, received %1." ).arg( args.size() );
+	    TTQString 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 ) {
 
-	TQString line = conin()->readLine();
+	TTQString line = conin()->readLine();
 	if ( !line.isNull() )
 	    return KJS::String( line );
 
     }
     else if ( id == MethodOpenFile ) {
 // #warning "This is leaked!!!!!"
-// 	TQFile *f=new TQFile( arg0 );
+// 	TTQFile *f=new TTQFile( arg0 );
 // 	int mode = 0;
-// 	if ( arg1 == TQString("ro") )
+// 	if ( arg1 == TTQString("ro") )
 // 	    mode = IO_ReadOnly;
-// 	else if ( arg1 == TQString("wo") )
+// 	else if ( arg1 == TTQString("wo") )
 // 	    mode = IO_WriteOnly;
 
 // 	if ( !f->open( mode ) )
 // 	    return KJS::Boolean(false);
 
-// 	Bindings::TextStream *ts = new Bindings::TextStream( part, "file", new TQTextStream(f) );
+// 	Bindings::TextStream *ts = new Bindings::TextStream( part, "file", new TTQTextStream(f) );
 
 // 	return KJS::Object( ts );
 	return KJS::Null();
     }
     else if ( id == MethodReadFile ) {
 
-	TQFile f( arg0 );
+	TTQFile f( arg0 );
 	if ( !f.open( IO_ReadOnly ) ) {
-	    TQString msg = i18n( "Could not open file '%1'." ).arg(arg0);
+	    TTQString msg = i18n( "Could not open file '%1'." ).arg(arg0);
       return throwError(exec, msg);
 	}
 
-	TQString s = f.readAll();
+	TTQString s = f.readAll();
 	return KJS::String( s );
     }
     else if ( id == MethodWriteFile ) {
-	TQFile f( arg0 );
+	TTQFile f( arg0 );
 	if ( !f.open( IO_WriteOnly ) )
 	    return KJS::Boolean( false );
 
-	TQTextStream ts( &f );
+	TTQTextStream 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 ) {
-	    TQString msg = i18n( "Method requires 2 arguments, received %1." ).arg( args.size() );
+	    TTQString 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) );
 
-	TQFile f( arg1 );
-	TQXmlInputSource src( &f );
-	TQXmlSimpleReader reader;
+	TTQFile f( arg1 );
+	TTQXmlInputSource src( &f );
+	TTQXmlSimpleReader 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() ) {
-	    TQString msg = i18n( "Method requires an object." );
+	    TTQString msg = i18n( "Method retquires an object." );
       return throwError(exec, msg,KJS::TypeError);
 	}
 
-	TQVariant v = dumpCompletion( exec, obj );
+	TTQVariant 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
-    	TQMessageBox::information( 0L, i18n("Information"), arg0 );
+    	TTQMessageBox::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 = TQMessageBox::question(0L, i18n("Question"), arg0 );
+    	answer = TTQMessageBox::question(0L, i18n("Question"), arg0 );
 #endif // QT_ONLY
 
 	return KJS::Number( answer );
     }
     else if ( id == MethodPrompt ) {
 
-	TQString text;
+	TTQString text;
 #ifndef QT_ONLY
 	text = KInputDialog::getText( arg0, arg0, arg1 );
 #else // QT_ONLY
-	text = QInputDialog::getText( arg0, arg0, TQLineEdit::Normal, arg1 );
+	text = TQInputDialog::getText( arg0, arg0, TTQLineEdit::Normal, arg1 );
 #endif // QT_ONLY
 
 	return KJS::String( text );
     }
     else if ( id == MethodI18n ) {
-    	TQString retString(i18n(arg0.latin1()));
+    	TTQString 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/");
-	TQString fname = KGlobal::dirs ()->findResource ("kjsembed", TQString(arg0));
+	TTQString fname = KGlobal::dirs ()->findResource ("kjsembed", TTQString(arg0));
 
 	kdDebug(80001) << "Loading: " << fname  << endl;
 
-	//TQString code = part->loadFile(fname);
+	//TTQString 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;
     }
 
-    TQString msg = i18n( "JSBuiltInImp has no method with id '%1'." ).arg( id );
+    TTQString 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 6d833457..7393b17e 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 TQString &param=TQString::null );
+    JSBuiltInImp( JSBuiltIn *builtin, int id, const TTQString &param=TTQString::null );
     ~JSBuiltInImp();
 
-    TQString parameter() const { return param; }
+    TTQString 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;
-    TQString param;
+    TTQString param;
     class JSBuiltInImpPrivate *d;
 };
 
diff --git a/kjsembed/jsbuiltinproxy.cpp b/kjsembed/jsbuiltinproxy.cpp
index 8ee39143..2c6ea816 100644
--- a/kjsembed/jsbuiltinproxy.cpp
+++ b/kjsembed/jsbuiltinproxy.cpp
@@ -18,7 +18,7 @@
  */
 #include "jsbuiltinproxy.h"
 namespace KJSEmbed {
-JSBuiltinProxy::JSBuiltinProxy( const TQString &name ) : JSProxy( JSProxy::BuiltinProxy ), m_name(name)
+JSBuiltinProxy::JSBuiltinProxy( const TTQString &name ) : JSProxy( JSProxy::BuiltinProxy ), m_name(name)
 {
 
 }
@@ -28,7 +28,7 @@ JSBuiltinProxy::~JSBuiltinProxy()
 
 }
 
-TQString JSBuiltinProxy::typeName() const
+TTQString JSBuiltinProxy::typeName() const
 {
     return m_name;
 }
@@ -41,7 +41,7 @@ bool JSBuiltinProxy::inherits( const char *clazz )
 
 KJS::UString JSBuiltinProxy::toString( KJS::ExecState */*exec*/ ) const
 {
-  TQString s( "%1 (%2)" );
+  TTQString s( "%1 (%2)" );
   return KJS::UString( s.arg("JSBuiltinProxy").arg(m_name).latin1() );
 }
 
diff --git a/kjsembed/jsbuiltinproxy.h b/kjsembed/jsbuiltinproxy.h
index 6eacd4ac..c3ae95d5 100644
--- a/kjsembed/jsbuiltinproxy.h
+++ b/kjsembed/jsbuiltinproxy.h
@@ -35,11 +35,11 @@ namespace KJSEmbed {
 class KJSEMBED_EXPORT JSBuiltinProxy : public JSProxy
 {
 public:
-    JSBuiltinProxy( const TQString &name );
+    JSBuiltinProxy( const TTQString &name );
     virtual ~JSBuiltinProxy();
 
 
-    virtual TQString typeName() const;
+    virtual TTQString 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:
-    TQString m_name;
+    TTQString m_name;
 };
 
 } // namespace KJSEmbed
diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp
index f69ba6c5..f3c61c6c 100644
--- a/kjsembed/jsconsolewidget.cpp
+++ b/kjsembed/jsconsolewidget.cpp
@@ -50,11 +50,11 @@ class JSConsoleWidgetPrivate
 {
 };
 
-JSConsoleWidget::JSConsoleWidget( KJSEmbedPart *jspart, TQWidget *parent, const char *name )
-    : TQFrame( parent, name ? name : "jsconsole_widget" ),
+JSConsoleWidget::JSConsoleWidget( KJSEmbedPart *jspart, TTQWidget *parent, const char *name )
+    : TTQFrame( parent, name ? name : "jsconsole_widget" ),
       js(jspart), proc(0), d(0)
 {
-    setFocusPolicy( TQWidget::StrongFocus );
+    setFocusPolicy( TTQWidget::StrongFocus );
     createView();
 }
 
@@ -64,8 +64,8 @@ JSConsoleWidget::~JSConsoleWidget()
 
 void JSConsoleWidget::createView()
 {
-    TQPixmap px( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeSmall) );
-    TQPixmap pxl( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeLarge) );
+    TTQPixmap px( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeSmall) );
+    TTQPixmap pxl( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeLarge) );
     setIcon( px );
     KWin::setIcons( winId(), pxl, px );
 
@@ -76,33 +76,33 @@ void JSConsoleWidget::createView()
     log = new KTextEdit( this, "log_widget" );
     log->setReadOnly( true );
     log->setUndoRedoEnabled( false );
-    log->setTextFormat( Qt::RichText );
-    log->setWrapPolicy( TQTextEdit::Anywhere );
+    log->setTextFormat( TQt::RichText );
+    log->setWrapPolicy( TTQTextEdit::Anywhere );
     log->setText( "<qt><pre>" );
-    log->setFocusPolicy( TQWidget::NoFocus );
+    log->setFocusPolicy( TTQWidget::NoFocus );
 
     // Command entry section
-    cmdBox = new TQHBox( this, "cmd_box" );
+    cmdBox = new TTQHBox( this, "cmd_box" );
     cmdBox->setSpacing( KDialog::spacingHint() );
 
-    TQLabel *prompt = new TQLabel( i18n("&KJS>"), cmdBox, "prompt" );
+    TTQLabel *prompt = new TTQLabel( i18n("&KJS>"), cmdBox, "prompt" );
     cmd = new KLineEdit( cmdBox, "cmd_edit" );
-    cmd->setFocusPolicy( TQWidget::StrongFocus );
+    cmd->setFocusPolicy( TTQWidget::StrongFocus );
     cmd->setFocus();
     prompt->setBuddy( cmd );
 
-    go = new TQPushButton( i18n("&Run"), cmdBox, "run_button" );
+    go = new TTQPushButton( i18n("&Run"), cmdBox, "run_button" );
     go->setFixedSize( go->sizeHint() );
 
-    connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), go, TQT_SLOT( animateClick() ) );
+    connect( cmd, TQT_SIGNAL(returnPressed(const TTQString&)), go, TQT_SLOT( animateClick() ) );
     connect( go, TQT_SIGNAL( clicked() ), TQT_SLOT( invoke() ) );
 
     // Setup completion
     KCompletion *comp = cmd->completionObject();
-    connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), comp, TQT_SLOT(addItem(const TQString&)) );
+    connect( cmd, TQT_SIGNAL(returnPressed(const TTQString&)), comp, TQT_SLOT(addItem(const TTQString&)) );
 
     // Layout
-    TQVBoxLayout *vert = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+    TTQVBoxLayout *vert = new TTQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
     vert->addWidget( ttl );
     vert->addWidget( log );
     vert->addWidget( cmdBox );
@@ -110,17 +110,17 @@ void JSConsoleWidget::createView()
 
 void JSConsoleWidget::invoke()
 {
-    TQString code( cmd->text() );
-    println( TQString( "<b><font color=\"#888888\">KJS&gt;</font> %1</b>" ).arg( code ) );
+    TTQString code( cmd->text() );
+    println( TTQString( "<b><font color=\"#888888\">KJS&gt;</font> %1</b>" ).arg( code ) );
     execute( code );
 }
 
-bool JSConsoleWidget::execute( const TQString &cmd )
+bool JSConsoleWidget::execute( const TTQString &cmd )
 {
     return execute( cmd, KJS::Null() );
 }
 
-bool JSConsoleWidget::execute( const TQString &cmd, const KJS::Value &self )
+bool JSConsoleWidget::execute( const TTQString &cmd, const KJS::Value &self )
 {
     KJS::Completion jsres;
     bool ok = js->execute( jsres, cmd, self );
@@ -141,8 +141,8 @@ bool JSConsoleWidget::execute( const TQString &cmd, const KJS::Value &self )
 	    return ok;
 	}
 
-	TQString txt = s.qstring();
-	txt = txt.replace( TQChar('\n'), "<br>" );
+	TTQString txt = s.qstring();
+	txt = txt.replace( TTQChar('\n'), "<br>" );
 	println( txt );
 
 	return ok;
@@ -166,15 +166,15 @@ bool JSConsoleWidget::execute( const TQString &cmd, const KJS::Value &self )
     return ok;
 }
 
-void JSConsoleWidget::println( const TQString &msg )
+void JSConsoleWidget::println( const TTQString &msg )
 {
     log->append( msg );
     log->scrollToBottom();
 }
 
-void JSConsoleWidget::warn( const TQString &msg )
+void JSConsoleWidget::warn( const TTQString &msg )
 {
-    TQString err( "<font color=\"red\"><b>%1</b></font>" );
+    TTQString err( "<font color=\"red\"><b>%1</b></font>" );
     println( err.arg(msg) );
 }
 
@@ -182,7 +182,7 @@ void JSConsoleWidget::warn( const TQString &msg )
 // Process Handling
 //
 
-bool JSConsoleWidget::run( const TQString &cmd )
+bool JSConsoleWidget::run( const TTQString &cmd )
 {
     kdDebug(80001) << "JSConsoleWidget::run(" << cmd << ")" << endl;
 
@@ -205,7 +205,7 @@ bool JSConsoleWidget::run( const TQString &cmd )
 
 void JSConsoleWidget::childExited()
 {
-    TQString s;
+    TTQString s;
     if ( proc->normalExit() ) {
 	if ( proc->exitStatus() )
 	    s = i18n( "<b>[Exited with status %1]</b>\n" ).arg( proc->exitStatus() );
@@ -224,14 +224,14 @@ void JSConsoleWidget::childExited()
 
 void JSConsoleWidget::receivedStdOutput( KProcess *, char *buffer, int buflen )
 {
-    TQCString buf = TQCString( buffer, buflen+1 );
-    println( TQString(buf) );
+    TTQCString buf = TTQCString( buffer, buflen+1 );
+    println( TTQString(buf) );
 }
 
 void JSConsoleWidget::receivedStdError( KProcess *, char *buffer, int buflen )
 {
-    TQCString buf = TQCString( buffer, buflen+1 );
-    warn( TQString(buf) );
+    TTQCString buf = TTQCString( buffer, buflen+1 );
+    warn( TTQString(buf) );
 }
 
 
diff --git a/kjsembed/jsconsolewidget.h b/kjsembed/jsconsolewidget.h
index 52a5e0bd..0d3598ce 100644
--- a/kjsembed/jsconsolewidget.h
+++ b/kjsembed/jsconsolewidget.h
@@ -25,8 +25,8 @@
 #include <tqframe.h>
 #include <kjsembed/global.h>
 
-class TQPushButton;
-class TQHBox;
+class TTQPushButton;
+class TTQHBox;
 
 class KLineEdit;
 class KPopupTitle;
@@ -43,7 +43,7 @@ namespace KJSEmbed {
 class KJSEmbedPart;
 
 /**
- * A TQWidget that provides a console for executing Javascript commands. Creating
+ * A TTQWidget that provides a console for executing Javascript commands. Creating
  * a JS console is easy, as you can see below:
  *
  * <pre>
@@ -59,12 +59,12 @@ class KJSEmbedPart;
  * @version $Id$
  * @author Richard Moore, rich@kde.org
  */
-class KJSEMBED_EXPORT JSConsoleWidget : public QFrame
+class KJSEMBED_EXPORT JSConsoleWidget : public TQFrame
 {
     Q_OBJECT
 
 public:
-    JSConsoleWidget( KJSEmbedPart *js, TQWidget *parent=0, const char *name=0 );
+    JSConsoleWidget( KJSEmbedPart *js, TTQWidget *parent=0, const char *name=0 );
     virtual ~JSConsoleWidget();
 
 public slots:
@@ -78,28 +78,28 @@ public slots:
     KPopupTitle *title() const { return ttl; }
 
     /**
-     * Returns the TQHBox used to layout the entry part of the console. This
+     * Returns the TTQHBox 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.
      */
-    TQHBox *commandBox() const { return cmdBox; }
+    TTQHBox *commandBox() const { return cmdBox; }
 
     /** Invokes the content of the command entry field. */
     void invoke();
 
     /** Invokes the specified command string. */
-    virtual bool execute( const TQString &cmd );
+    virtual bool execute( const TTQString &cmd );
 
-    bool execute( const TQString &cmd, const KJS::Value &self );
+    bool execute( const TTQString &cmd, const KJS::Value &self );
 
     /** Prints the specified string to the console. */
-    virtual void println( const TQString &text );
+    virtual void println( const TTQString &text );
 
     /**
      * Prints the specified string to the console as a warning, the default
      * implementation prints the text in red.
      */
-    virtual void warn( const TQString &text );
+    virtual void warn( const TTQString &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 TQString &shellCmd );
+    virtual bool run( const TTQString &shellCmd );
 
 protected:
     /** Creates the console view. */
@@ -136,9 +136,9 @@ private:
     KShellProcess *proc;
 
     KTextEdit *log;
-    TQHBox *cmdBox;
+    TTQHBox *cmdBox;
     KLineEdit *cmd;
-    TQPushButton *go;
+    TTQPushButton *go;
     KPopupTitle *ttl;
 
     class JSConsoleWidgetPrivate *d;
diff --git a/kjsembed/jseventmapper.cpp b/kjsembed/jseventmapper.cpp
index 000353d3..062f2c22 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, TQEvent::Type _type ) :
+    EventType( KJS::Identifier _id, TTQEvent::Type _type ) :
 	id(_id), type(_type) {;}
 
     const KJS::Identifier id;
-    const TQEvent::Type type;
+    const TTQEvent::Type type;
 };
 
 static EventType events[] = {
-	EventType(KJS::Identifier("timerEvent"), TQEvent::Timer),
+	EventType(KJS::Identifier("timerEvent"), TTQEvent::Timer),
 
 #ifdef ENABLE_CHILDEVENTS
-    EventType( KJS::Identifier("childInsertEvent"), TQEvent::ChildInserted ),
-    EventType( KJS::Identifier("childRemoveEvent"), TQEvent::ChildRemoved ),
+    EventType( KJS::Identifier("childInsertEvent"), TTQEvent::ChildInserted ),
+    EventType( KJS::Identifier("childRemoveEvent"), TTQEvent::ChildRemoved ),
 #endif
 
-    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("mouseReleaseEvent"), TTQEvent::MouseButtonRelease ),
+    EventType( KJS::Identifier("mouseMoveEvent"), TTQEvent::MouseMove ),
+    EventType( KJS::Identifier("mouseDoubleClickEvent"), TTQEvent::MouseButtonDblClick ),
+    EventType( KJS::Identifier("mousePressEvent"), TTQEvent::MouseButtonPress ),
 
-    EventType( KJS::Identifier("keyPressEvent"), TQEvent::KeyPress ),
-    EventType( KJS::Identifier("keyReleaseEvent"), TQEvent::KeyRelease ),
+    EventType( KJS::Identifier("keyPressEvent"), TTQEvent::KeyPress ),
+    EventType( KJS::Identifier("keyReleaseEvent"), TTQEvent::KeyRelease ),
 
-    EventType( KJS::Identifier("paintEvent"), TQEvent::Paint ),
+    EventType( KJS::Identifier("paintEvent"), TTQEvent::Paint ),
 
-    EventType( KJS::Identifier("moveEvent"), TQEvent::Move ),
-    EventType( KJS::Identifier("resizeEvent"), TQEvent::Resize ),
+    EventType( KJS::Identifier("moveEvent"), TTQEvent::Move ),
+    EventType( KJS::Identifier("resizeEvent"), TTQEvent::Resize ),
 
-    EventType( KJS::Identifier("closeEvent"), TQEvent::Close ),
+    EventType( KJS::Identifier("closeEvent"), TTQEvent::Close ),
 
-    EventType( KJS::Identifier("showEvent"), TQEvent::Show ),
-    EventType( KJS::Identifier("hideEvent"), TQEvent::Hide ),
+    EventType( KJS::Identifier("showEvent"), TTQEvent::Show ),
+    EventType( KJS::Identifier("hideEvent"), TTQEvent::Hide ),
 
-    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("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(), TQEvent::None )
+    EventType( KJS::Identifier(), TTQEvent::None )
 };
 
 JSEventMapper::JSEventMapper()
@@ -73,23 +73,23 @@ JSEventMapper::JSEventMapper()
     do {
 	addEvent( events[i].id, events[i].type );
 	i++;
-    } while( events[i].type != TQEvent::None );
+    } while( events[i].type != TTQEvent::None );
 }
 
 JSEventMapper::~JSEventMapper()
 {
 }
 
-void JSEventMapper::addEvent( const KJS::Identifier &name, TQEvent::Type t )
+void JSEventMapper::addEvent( const KJS::Identifier &name, TTQEvent::Type t )
 {
     handlerToEvent.insert( name.qstring(), (const uint *) t );
     eventToHandler.insert( (long) t, &name );
 }
 
-TQEvent::Type JSEventMapper::findEventType( const KJS::Identifier &name ) const
+TTQEvent::Type JSEventMapper::findEventType( const KJS::Identifier &name ) const
 {
     uint evt = (uint)(long)handlerToEvent[ name.qstring() ];
-    return static_cast<TQEvent::Type>( evt );
+    return static_cast<TTQEvent::Type>( evt );
 }
 
 } // namespace KJSEmbed
diff --git a/kjsembed/jseventmapper.h b/kjsembed/jseventmapper.h
index 3539e94a..f086a982 100644
--- a/kjsembed/jseventmapper.h
+++ b/kjsembed/jseventmapper.h
@@ -32,7 +32,7 @@
 namespace KJSEmbed {
 
 /**
- * Maintains a map between the types of TQEvent and the names of their event
+ * Maintains a map between the types of TTQEvent 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, TQEvent::Type t );
+    void addEvent( const KJS::Identifier &name, TTQEvent::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. */
-    TQEvent::Type findEventType( const KJS::Identifier &name ) const;
+    TTQEvent::Type findEventType( const KJS::Identifier &name ) const;
 
-    KJS::Identifier *findEventHandler( TQEvent::Type t ) const { return eventToHandler.find(t); }
+    KJS::Identifier *findEventHandler( TTQEvent::Type t ) const { return eventToHandler.find(t); }
 
 private:
-    TQDict<uint> handlerToEvent;
-    TQIntDict<KJS::Identifier> eventToHandler;
+    TTQDict<uint> handlerToEvent;
+    TTQIntDict<KJS::Identifier> eventToHandler;
     class JSEventMapperPrivate *d;
 };
 
diff --git a/kjsembed/jseventutils.cpp b/kjsembed/jseventutils.cpp
index 4c5bbd13..2aabf762 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 TQMouseEvent *ev, const JSObjectProxy *context )
+					const TTQMouseEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object mev = convertEvent( exec, (TQEvent *)ev, context);
+    KJS::Object mev = convertEvent( exec, (TTQEvent *)ev, context);
 
-    mev.put( exec, "pos", convertToValue( exec, TQVariant(ev->pos()) ) );
+    mev.put( exec, "pos", convertToValue( exec, TTQVariant(ev->pos()) ) );
     mev.put( exec, "x", KJS::Number(ev->x()) );
     mev.put( exec, "y", KJS::Number(ev->y()) );
 
-    mev.put( exec, "globalPos", convertToValue( exec, TQVariant(ev->globalPos()) ) );
+    mev.put( exec, "globalPos", convertToValue( exec, TTQVariant(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 TQPaintEvent *ev, const JSObjectProxy *context )
+					const TTQPaintEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object pev = convertEvent( exec, (TQEvent *)ev, context);
+    KJS::Object pev = convertEvent( exec, (TTQEvent *)ev, context);
 
-    pev.put( exec, "rect", convertToValue( exec, TQVariant(ev->rect()) ) );
-    pev.put( exec, "erased", convertToValue( exec, TQVariant(ev->erased()) ) );
+    pev.put( exec, "rect", convertToValue( exec, TTQVariant(ev->rect()) ) );
+    pev.put( exec, "erased", convertToValue( exec, TTQVariant(ev->erased()) ) );
     return pev;
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TQKeyEvent *ev, const JSObjectProxy *context )
+					const TTQKeyEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object kev = convertEvent( exec, (TQEvent *)ev, context);
+    KJS::Object kev = convertEvent( exec, (TTQEvent *)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, TQVariant(ev->accept()), context ) );
-    //kev.put( exec, "ignore", KJS::Void( exec, TQVariant(ev->ignore()), context ) );
+    //kev.put( exec, "accept", KJS::Void( exec, TTQVariant(ev->accept()), context ) );
+    //kev.put( exec, "ignore", KJS::Void( exec, TTQVariant(ev->ignore()), context ) );
     return kev;
 }
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TQIMEvent *ev, const JSObjectProxy *context )
+					const TTQIMEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object qev = convertEvent( exec, (TQEvent *)ev, context);
+    KJS::Object qev = convertEvent( exec, (TTQEvent *)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, TQVariant(ev->accept()), context ) );
-    //qev.put( exec, "ignore", KJS::Void( exec, TQVariant(ev->ignore()), context ) );
+    //qev.put( exec, "accept", KJS::Void( exec, TTQVariant(ev->accept()), context ) );
+    //qev.put( exec, "ignore", KJS::Void( exec, TTQVariant(ev->ignore()), context ) );
     return qev;
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TQResizeEvent *ev, const JSObjectProxy *context )
+					const TTQResizeEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object rev = convertEvent( exec, (TQEvent *)ev, context);
+    KJS::Object rev = convertEvent( exec, (TTQEvent *)ev, context);
 
-    rev.put( exec, "size", convertToValue( exec, TQVariant(ev->size()) ));
-    rev.put( exec, "oldSize", convertToValue( exec, TQVariant(ev->oldSize())  ));
+    rev.put( exec, "size", convertToValue( exec, TTQVariant(ev->size()) ));
+    rev.put( exec, "oldSize", convertToValue( exec, TTQVariant(ev->oldSize())  ));
     return rev;
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TQFocusEvent *ev, const JSObjectProxy *context )
+					const TTQFocusEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object fev = convertEvent( exec, (TQEvent *)ev, context);
+    KJS::Object fev = convertEvent( exec, (TTQEvent *)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 TQCloseEvent *ev, const JSObjectProxy *context )
+					const TTQCloseEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object cev = convertEvent( exec, (TQEvent *)ev, context);
+    KJS::Object cev = convertEvent( exec, (TTQEvent *)ev, context);
 
     cev.put( exec, "isAccepted", KJS::Boolean(ev->isAccepted()) );
-    //cev.put( exec, "accept", KJS::Void( exec, TQVariant(ev->accept()), context ) );
-    //cev.put( exec, "ignore", KJS::Void( exec, TQVariant(ev->ignore()), context ) );
+    //cev.put( exec, "accept", KJS::Void( exec, TTQVariant(ev->accept()), context ) );
+    //cev.put( exec, "ignore", KJS::Void( exec, TTQVariant(ev->ignore()), context ) );
     return cev;
 }
 
 #ifdef ENABLE_CHILDEVENTS
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TQChildEvent *ev, const JSObjectProxy *context )
+					const TTQChildEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object cev = convertEvent( exec, (TQEvent *)ev, context);
+    KJS::Object cev = convertEvent( exec, (TTQEvent *)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 TQMoveEvent *ev, const JSObjectProxy *context )
+					const TTQMoveEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object mev = convertEvent( exec, (TQEvent *)ev, context);
+    KJS::Object mev = convertEvent( exec, (TTQEvent *)ev, context);
 
-    mev.put( exec, "pos", convertToValue( exec, TQVariant(ev->pos()) ));
-    mev.put( exec, "oldPos", convertToValue( exec, TQVariant(ev->oldPos()) ));
+    mev.put( exec, "pos", convertToValue( exec, TTQVariant(ev->pos()) ));
+    mev.put( exec, "oldPos", convertToValue( exec, TTQVariant(ev->oldPos()) ));
     return mev;
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TQWheelEvent *ev, const JSObjectProxy *context )
+					const TTQWheelEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object wev = convertEvent( exec, (TQEvent *)ev, context);
+    KJS::Object wev = convertEvent( exec, (TTQEvent *)ev, context);
 
     wev.put( exec, "delta", KJS::Number(ev->delta()) );
-    wev.put( exec, "pos", convertToValue( exec, TQVariant(ev->pos()) ) );
-    wev.put( exec, "globalPos", convertToValue( exec, TQVariant(ev->globalPos()) ) );
+    wev.put( exec, "pos", convertToValue( exec, TTQVariant(ev->pos()) ) );
+    wev.put( exec, "globalPos", convertToValue( exec, TTQVariant(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, TQVariant(ev->accept()), context ) );
-    //wev.put( exec, "ignore", KJS::Void( exec, TQVariant(ev->ignore()), context ) );
+    //wev.put( exec, "accept", KJS::Void( exec, TTQVariant(ev->accept()), context ) );
+    //wev.put( exec, "ignore", KJS::Void( exec, TTQVariant(ev->ignore()), context ) );
     return wev;
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TQEvent *ev, const JSObjectProxy * /*context*/)
+					const TTQEvent *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 TQDropEvent * ev, const JSObjectProxy * context )
+KJS::Object JSEventUtils::convertEvent( KJS::ExecState * exec, const TTQDropEvent * ev, const JSObjectProxy * context )
 {
-	KJS::Object dev = convertEvent( exec, (TQEvent *)ev, context);
-	dev.put( exec, "pos", convertToValue( exec, TQVariant(ev->pos()) ) );
+	KJS::Object dev = convertEvent( exec, (TTQEvent *)ev, context);
+	dev.put( exec, "pos", convertToValue( exec, TTQVariant(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 TQDropEvent
 } 
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-				const TQDragMoveEvent *ev, const JSObjectProxy *context )
+				const TTQDragMoveEvent *ev, const JSObjectProxy *context )
 {
-	KJS::Object mev = convertEvent(exec, (TQDropEvent *)ev, context);
-	mev.put( exec, "answerRect", convertToValue( exec, TQVariant(ev->answerRect()) ) );
+	KJS::Object mev = convertEvent(exec, (TTQDropEvent *)ev, context);
+	mev.put( exec, "answerRect", convertToValue( exec, TTQVariant(ev->answerRect()) ) );
 	return mev;
 } 
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-				const TQTimerEvent *ev, const JSObjectProxy *context )
+				const TTQTimerEvent *ev, const JSObjectProxy *context )
 {
-	KJS::Object dev = convertEvent( exec, (TQEvent *)ev, context);
+	KJS::Object dev = convertEvent( exec, (TTQEvent *)ev, context);
 	dev.put( exec, "timerId", KJS::Number(ev->timerId()) );
 	return dev;
 } 
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-				const TQContextMenuEvent *ev, const JSObjectProxy *context )
+				const TTQContextMenuEvent *ev, const JSObjectProxy *context )
 {
-	KJS::Object cxev = convertEvent( exec, (TQEvent *)ev, context);
+	KJS::Object cxev = convertEvent( exec, (TTQEvent *)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, TQVariant(ev->pos()) ) );
-	cxev.put( exec, "globalPos", convertToValue( exec, TQVariant(ev->globalPos()) ) );
+	cxev.put( exec, "pos",convertToValue( exec, TTQVariant(ev->pos()) ) );
+	cxev.put( exec, "globalPos", convertToValue( exec, TTQVariant(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 2d2044e9..6ec70f21 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 TQMouseEvent *ev, const JSObjectProxy *context );
+				     const TTQMouseEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQPaintEvent *ev, const JSObjectProxy *context );
+				     const TTQPaintEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQKeyEvent *ev, const JSObjectProxy *context );
+				     const TTQKeyEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQIMEvent *ev, const JSObjectProxy *context );
+				     const TTQIMEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQResizeEvent *ev, const JSObjectProxy *context );
+				     const TTQResizeEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQFocusEvent *ev, const JSObjectProxy *context );
+				     const TTQFocusEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQCloseEvent *ev, const JSObjectProxy *context );
+				     const TTQCloseEvent *ev, const JSObjectProxy *context );
 
 #ifdef ENABLE_CHILDEVENTS
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQChildEvent *ev, const JSObjectProxy *context );
+				     const TTQChildEvent *ev, const JSObjectProxy *context );
 #endif
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQMoveEvent *ev, const JSObjectProxy *context );
+				     const TTQMoveEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQWheelEvent *ev, const JSObjectProxy *context );
+				     const TTQWheelEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQEvent *ev, const JSObjectProxy *context );
+				     const TTQEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQDropEvent *ev, const JSObjectProxy *context );
+				     const TTQDropEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQDragMoveEvent *ev, const JSObjectProxy *context );
+				     const TTQDragMoveEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQTimerEvent *ev, const JSObjectProxy *context );
+				     const TTQTimerEvent *ev, const JSObjectProxy *context );
 
    static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TQContextMenuEvent *ev, const JSObjectProxy *context );
+				     const TTQContextMenuEvent *ev, const JSObjectProxy *context );
 
 
 
diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp
index b33d9f81..8749481a 100644
--- a/kjsembed/jsfactory.cpp
+++ b/kjsembed/jsfactory.cpp
@@ -137,9 +137,9 @@ namespace KJSEmbed {
 
     class JSFactoryPrivate {
     public:
-        TQDict<KJSEmbed::Bindings::JSBindingPlugin> plugins;
-        TQDict<KJSEmbed::Bindings::JSBindingBase> opaqueTypes;
-        TQDict<KJSEmbed::Bindings::JSBindingBase> objectTypes;
+        TTQDict<KJSEmbed::Bindings::JSBindingPlugin> plugins;
+        TTQDict<KJSEmbed::Bindings::JSBindingBase> opaqueTypes;
+        TTQDict<KJSEmbed::Bindings::JSBindingBase> objectTypes;
     };
 
 
@@ -147,9 +147,9 @@ namespace KJSEmbed {
             : jspart( part ) {
         evmapper = new JSEventMapper();
         d = new JSFactoryPrivate;
-        registerOpaqueType("TQDir", new Bindings::QDirLoader());
-        registerOpaqueType("TQCheckListItem", new Bindings::QCheckListItemLoader());
-        registerOpaqueType("TQListViewItem", new Bindings::QListViewItemLoader());
+        registerOpaqueType("TTQDir", new Bindings::TQDirLoader());
+        registerOpaqueType("TTQCheckListItem", new Bindings::TQCheckListItemLoader());
+        registerOpaqueType("TTQListViewItem", 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() ) {
-            TQString classname = ( *itr ) ->name();
+            TTQString 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 TQString &classname ) const {
+    bool JSFactory::isBindingPlugin( const TTQString &classname ) const {
         if ( !isSupported( classname ) )
             return false;
         return ( objtypes[ classname ] & TypePlugin );
     }
 
-    KJS::Object JSFactory::createBindingPlugin( KJS::ExecState *exec, const TQString &classname, const KJS::List &args ) {
+    KJS::Object JSFactory::createBindingPlugin( KJS::ExecState *exec, const TTQString &classname, const KJS::List &args ) {
 #ifndef QT_ONLY
 
         Bindings::JSBindingPlugin * plugin = d->plugins[ classname ];
         if ( plugin == 0L ) {
-            TQString query = "JSBindingPlugin/Binding";
-            TQString constraint = "[Name] == '" + classname + "'";
+            TTQString query = "JSBindingPlugin/Binding";
+            TTQString constraint = "[Name] == '" + classname + "'";
             plugin = KParts::ComponentFactory::createInstanceFromQuery<Bindings::JSBindingPlugin>( query, constraint );
             if ( plugin != 0L )
                 d->plugins.insert( classname, plugin );
@@ -219,28 +219,28 @@ namespace KJSEmbed {
         return KJS::Object();
     }
 
-    KJS::Object JSFactory::create( KJS::ExecState *exec, const TQString &classname, const KJS::List &args ) {
+    KJS::Object JSFactory::create( KJS::ExecState *exec, const TTQString &classname, const KJS::List &args ) {
         KJS::Object returnObject;
         if ( !isSupported( classname ) ) {
-            TQString msg = i18n( "Object of type '%1' is not supported." ).arg( classname );
+            TTQString msg = i18n( "Object of type '%1' is not supported." ).arg( classname );
             return throwError(exec, msg,KJS::TypeError);
         }
-        if ( isQObject( classname ) ) {
+        if ( isTQObject( classname ) ) {
             // create via widget factory...
             Bindings::JSBindingBase *factory =  d->objectTypes.find(classname);
             if( factory ) {
                 returnObject = factory->createBinding( jspart, exec, args );
                 JSProxy::toProxy( returnObject.imp() ) ->setOwner( JSProxy::JavaScript );
             } else {
-                TQObject *parent = extractQObject(exec, args, 0);
-                TQString name = extractQString(exec, args, 1);
+                TTQObject *parent = extractTQObject(exec, args, 0);
+                TTQString name = extractTQString(exec, args, 1);
     
-                TQObject *obj = create( classname, parent, name.latin1() );
+                TTQObject *obj = create( classname, parent, name.latin1() );
                 if ( obj ) {
                     returnObject = createProxy( exec, obj );
                     JSProxy::toProxy( returnObject.imp() ) ->setOwner( JSProxy::JavaScript );
                 } else {
-                    TQString msg = i18n( "TQObject of type '%1' could not be created." ).arg( classname );
+                    TTQString msg = i18n( "TTQObject 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() ) {
-                TQString msg = i18n( "Opaque object of type '%1' could not be created." ).arg( classname );
+                TTQString 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() ) {
-                TQString msg = i18n( "Value object of type '%1' could not be created." ).arg( classname );
+                TTQString 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() ) {
-                TQString msg = i18n( "Plugin object of type '%1' could not be created." ).arg( classname );
+                TTQString 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 {
-            TQString msg = i18n( "Could not create object of type '%1'." ).arg( classname );
+            TTQString 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, TQObject *target,
+    KJS::Object JSFactory::createProxy( KJS::ExecState *exec, TTQObject *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,
-                                        TQTextStream *target, const JSObjectProxy *context ) const {
+                                        TTQTextStream *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,
-                                        TQEvent *target, const JSObjectProxy *context ) const {
+                                        TTQEvent *target, const JSObjectProxy *context ) const {
         switch ( target->type() ) {
-            case TQEvent::MouseButtonPress:
-            case TQEvent::MouseButtonRelease:
-            case TQEvent::MouseMove:
-            case TQEvent::MouseButtonDblClick:
-                return JSEventUtils::convertEvent( exec, ( TQMouseEvent * ) target, context );
+            case TTQEvent::MouseButtonPress:
+            case TTQEvent::MouseButtonRelease:
+            case TTQEvent::MouseMove:
+            case TTQEvent::MouseButtonDblClick:
+                return JSEventUtils::convertEvent( exec, ( TTQMouseEvent * ) target, context );
                 break;
-            case TQEvent::KeyPress:
-            case TQEvent::KeyRelease:
-            case TQEvent::Accel:
-            case TQEvent::AccelOverride:
-                return JSEventUtils::convertEvent( exec, ( TQKeyEvent * ) target, context );
+            case TTQEvent::KeyPress:
+            case TTQEvent::KeyRelease:
+            case TTQEvent::Accel:
+            case TTQEvent::AccelOverride:
+                return JSEventUtils::convertEvent( exec, ( TTQKeyEvent * ) target, context );
                 break;
-            case TQEvent::IMStart:
-            case TQEvent::IMCompose:
-            case TQEvent::IMEnd:
-                return JSEventUtils::convertEvent( exec, ( TQIMEvent * ) target, context );
+            case TTQEvent::IMStart:
+            case TTQEvent::IMCompose:
+            case TTQEvent::IMEnd:
+                return JSEventUtils::convertEvent( exec, ( TTQIMEvent * ) target, context );
                 break;
-            case TQEvent::Paint:
-                return JSEventUtils::convertEvent( exec, ( TQPaintEvent * ) target, context );
+            case TTQEvent::Paint:
+                return JSEventUtils::convertEvent( exec, ( TTQPaintEvent * ) target, context );
                 break;
-            case TQEvent::Resize:
-                return JSEventUtils::convertEvent( exec, ( TQResizeEvent * ) target, context );
+            case TTQEvent::Resize:
+                return JSEventUtils::convertEvent( exec, ( TTQResizeEvent * ) target, context );
                 break;
-            case TQEvent::FocusIn:
-            case TQEvent::FocusOut:
-                return JSEventUtils::convertEvent( exec, ( TQFocusEvent * ) target, context );
+            case TTQEvent::FocusIn:
+            case TTQEvent::FocusOut:
+                return JSEventUtils::convertEvent( exec, ( TTQFocusEvent * ) target, context );
                 break;
-            case TQEvent::Close:
-                return JSEventUtils::convertEvent( exec, ( TQCloseEvent * ) target, context );
+            case TTQEvent::Close:
+                return JSEventUtils::convertEvent( exec, ( TTQCloseEvent * ) target, context );
                 break;
-            case TQEvent::ChildInserted:
-            case TQEvent::ChildRemoved:
-                return JSEventUtils::convertEvent( exec, ( TQChildEvent * ) target, context );
+            case TTQEvent::ChildInserted:
+            case TTQEvent::ChildRemoved:
+                return JSEventUtils::convertEvent( exec, ( TTQChildEvent * ) target, context );
                 break;
-            case TQEvent::Move:
-                return JSEventUtils::convertEvent( exec, ( TQMoveEvent * ) target, context );
+            case TTQEvent::Move:
+                return JSEventUtils::convertEvent( exec, ( TTQMoveEvent * ) target, context );
                 break;
-            case TQEvent::Wheel:
-                return JSEventUtils::convertEvent( exec, ( TQWheelEvent * ) target, context );
+            case TTQEvent::Wheel:
+                return JSEventUtils::convertEvent( exec, ( TTQWheelEvent * ) target, context );
                 break;
-            case TQEvent::Timer:
-                return JSEventUtils::convertEvent( exec, ( TQTimerEvent * ) target, context );
+            case TTQEvent::Timer:
+                return JSEventUtils::convertEvent( exec, ( TTQTimerEvent * ) target, context );
                 break;
-            case TQEvent::ContextMenu:
-                return JSEventUtils::convertEvent( exec, ( TQContextMenuEvent * ) target, context );
+            case TTQEvent::ContextMenu:
+                return JSEventUtils::convertEvent( exec, ( TTQContextMenuEvent * ) target, context );
                 break;
-            case TQEvent::DragMove:
-            case TQEvent::DragEnter:
-                return JSEventUtils::convertEvent( exec, ( TQDragMoveEvent * ) target, context );
+            case TTQEvent::DragMove:
+            case TTQEvent::DragEnter:
+                return JSEventUtils::convertEvent( exec, ( TTQDragMoveEvent * ) target, context );
                 break;
-            case TQEvent::Drop:
-                return JSEventUtils::convertEvent( exec, ( TQDropEvent * ) target, context );
+            case TTQEvent::Drop:
+                return JSEventUtils::convertEvent( exec, ( TTQDropEvent * ) target, context );
                 break;
-            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 );
+            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 );
                 break;
             default:
                 break;
         }
 
-        return JSEventUtils::convertEvent( exec, ( TQEvent * ) target, context );
+        return JSEventUtils::convertEvent( exec, ( TTQEvent * ) 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 ) {
-            TQString query = "JSBindingPlugin/Binding";
-            TQString constraint = "[Name] == '" + TQString::fromUtf8( proxy->object() ->className() ) + "'";
+            TTQString query = "JSBindingPlugin/Binding";
+            TTQString constraint = "[Name] == '" + TTQString::fromUtf8( proxy->object() ->className() ) + "'";
             plugin = KParts::ComponentFactory::createInstanceFromQuery<Bindings::JSBindingPlugin>( query, constraint );
             if ( plugin != 0L )
                 d->plugins.insert( proxy->object() ->className(), plugin );
@@ -424,7 +424,7 @@ namespace KJSEmbed {
     }
 
 
-    TQObject *JSFactory::createBinding( const TQString &cname, TQObject *parent, const char *name ) {
+    TTQObject *JSFactory::createBinding( const TTQString &cname, TTQObject *parent, const char *name ) {
 #ifndef QT_ONLY
 
         // Bindings
@@ -446,38 +446,38 @@ namespace KJSEmbed {
         return 0;
     }
 
-    TQObject *JSFactory::createObject( const TQString &cname, TQObject *parent, const char *name ) {
+    TTQObject *JSFactory::createObject( const TTQString &cname, TTQObject *parent, const char *name ) {
 
-        // QObjects defined by Qt
-        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 );
+        // 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 );
 
 #ifndef QT_ONLY
-        // QObjects defined by KDE
+        // TQObjects defined by KDE
         else if ( cname == "KAction" )
             return new KAction( parent, name );
         else if ( cname == "KToggleAction" )
             return new KToggleAction( parent, name );
 #endif // QT_ONLY
 
-        TQWidget *w = dynamic_cast<TQWidget *>( parent );
+        TTQWidget *w = dynamic_cast<TTQWidget *>( parent );
         if ( !w )
             return 0;
 
-        if ( cname == "TQHBoxLayout" )
-            return new TQHBoxLayout( w, 0, -1, name );
-        else if ( cname == "TQVBoxLayout" )
-            return new TQVBoxLayout( w, 0, -1, name );
+        if ( cname == "TTQHBoxLayout" )
+            return new TTQHBoxLayout( w, 0, -1, name );
+        else if ( cname == "TTQVBoxLayout" )
+            return new TTQVBoxLayout( w, 0, -1, name );
         return 0;
     }
 
-    KJS::Object JSFactory::createOpaque( KJS::ExecState *exec, const TQString &cname, const KJS::List &args ) {
+    KJS::Object JSFactory::createOpaque( KJS::ExecState *exec, const TTQString &cname, const KJS::List &args ) {
 
-        if ( cname == "TQCanvasText" ) {
+        if ( cname == "TTQCanvasText" ) {
                     kdDebug( 80001 ) << "Creating canvas item, type is " << cname << endl;
 
                     JSOpaqueProxy *prx = 0;
@@ -490,15 +490,15 @@ namespace KJSEmbed {
 
                         if ( arg0 ) {
 
-                            TQObject * obj0 = arg0->object();
+                            TTQObject * obj0 = arg0->object();
 
-                            if ( obj0->inherits( "TQCanvas" ) ) {
-                                TQCanvas * parent = ( TQCanvas * ) ( obj0 );
-                                prx = new JSOpaqueProxy( new TQCanvasText( parent ), "TQCanvasText" );
+                            if ( obj0->inherits( "TTQCanvas" ) ) {
+                                TTQCanvas * parent = ( TTQCanvas * ) ( obj0 );
+                                prx = new JSOpaqueProxy( new TTQCanvasText( parent ), "TTQCanvasText" );
 
                                 KJS::Object proxyObj( prx );
-                                QCanvasItemImp::addBindings( exec, proxyObj );
-                                QCanvasTextImp::addBindings( exec, proxyObj );
+                                TQCanvasItemImp::addBindings( exec, proxyObj );
+                                TQCanvasTextImp::addBindings( exec, proxyObj );
                                 return proxyObj;
                             } else {
                                 kdDebug( 80001 ) << " canvas item create failed, arg0 is " << obj0->className() << endl;
@@ -511,21 +511,21 @@ namespace KJSEmbed {
 
                     } else if ( args.size() == 2 ) {
 
-                        TQString arg0 = args[ 0 ].toString( exec ).qstring();
+                        TTQString arg0 = args[ 0 ].toString( exec ).qstring();
                         JSObjectProxy *arg1 = JSProxy::toObjectProxy( args[ 1 ].imp() );
 
                         if ( arg1 ) {
 
-                            TQString arg0 = args[ 0 ].toString( exec ).qstring();
-                            TQObject *obj1 = arg1->object();
+                            TTQString arg0 = args[ 0 ].toString( exec ).qstring();
+                            TTQObject *obj1 = arg1->object();
 
-                            if ( obj1->inherits( "TQCanvas" ) ) {
-                                TQCanvas * parent = ( TQCanvas * ) ( obj1 );
-                                prx = new JSOpaqueProxy( new TQCanvasText( parent ), "TQCanvasText" );
+                            if ( obj1->inherits( "TTQCanvas" ) ) {
+                                TTQCanvas * parent = ( TTQCanvas * ) ( obj1 );
+                                prx = new JSOpaqueProxy( new TTQCanvasText( parent ), "TTQCanvasText" );
 
                                 KJS::Object proxyObj( prx );
-                                QCanvasItemImp::addBindings( exec, proxyObj );
-                                QCanvasTextImp::addBindings( exec, proxyObj );
+                                TQCanvasItemImp::addBindings( exec, proxyObj );
+                                TQCanvasTextImp::addBindings( exec, proxyObj );
                                 return proxyObj;
                             } else {
                                 kdDebug( 80001 ) << " canvas item create failed, arg0 is " << obj1->className() << endl;
@@ -542,9 +542,9 @@ namespace KJSEmbed {
         return KJS::Object();
     }
 
-    KJS::Object JSFactory::createValue( KJS::ExecState *exec, const TQString &cname, const KJS::List & args ) {
+    KJS::Object JSFactory::createValue( KJS::ExecState *exec, const TTQString &cname, const KJS::List & args ) {
         if ( cname == "Image" ) {
-            TQImage img = TQImage();
+            TTQImage img = TTQImage();
             JSValueProxy *prx = new JSValueProxy( );
             prx->setValue( img );
             KJS::Object proxyObj( prx );
@@ -552,7 +552,7 @@ namespace KJSEmbed {
             return proxyObj;
         }
         if ( cname == "Pixmap" ) {
-            TQPixmap pix = TQPixmap();
+            TTQPixmap pix = TTQPixmap();
             JSValueProxy *prx = new JSValueProxy( );
             prx->setValue( pix );
             KJS::Object proxyObj( prx );
@@ -560,7 +560,7 @@ namespace KJSEmbed {
             return proxyObj;
         }
         if ( cname == "Brush" ) {
-            TQBrush brsh;
+            TTQBrush brsh;
             JSValueProxy *prx = new JSValueProxy( );
             prx->setValue( brsh );
             KJS::Object proxyObj( prx );
@@ -568,7 +568,7 @@ namespace KJSEmbed {
             return proxyObj;
         }
         if ( cname == "Pen" ) {
-            TQPen pen;
+            TTQPen pen;
             JSValueProxy *prx = new JSValueProxy( );
             prx->setValue( pen );
             KJS::Object proxyObj( prx );
@@ -576,7 +576,7 @@ namespace KJSEmbed {
             return proxyObj;
         }
         if ( cname == "Rect" ) {
-            TQRect rect;
+            TTQRect 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" ) {
-            TQPoint point;
+            TTQPoint 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" ) {
-            TQSize size;
+            TTQSize 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();
     }
 
-    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 );
+    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 );
             pix.fill();
-            return new TQSplashScreen( pix );
+            return new TTQSplashScreen( pix );
         }
 #ifndef QT_ONLY
         else if ( cname == "KMainWindow" )
@@ -646,22 +646,22 @@ namespace KJSEmbed {
         return 0;
     }
 
-    TQObject *JSFactory::create( const TQString &cname, TQObject *parent, const char *name ) {
+    TTQObject *JSFactory::create( const TTQString &cname, TTQObject *parent, const char *name ) {
         kdDebug( 80001 ) << "KJSEmbedPart::create() name " << name << " class " << cname << endl;
 
         // Factory widgets
-        TQWidgetFactory wf;
-        TQWidget *pw = ( parent && parent->isWidgetType() ) ? static_cast<TQWidget *>( parent ) : 0;
-        TQWidget *w = wf.createWidget( cname, pw, name );
+        TTQWidgetFactory wf;
+        TTQWidget *pw = ( parent && parent->isWidgetType() ) ? static_cast<TTQWidget *>( parent ) : 0;
+        TTQWidget *w = wf.createWidget( cname, pw, name );
         if ( w ) {
             kdDebug( 80001 ) << "Created from factory" << endl;
             return w;
         }
         // Custom widgets
-        TQObject *obj;
+        TTQObject *obj;
         obj = createWidget( cname, pw, name );
         if ( obj ) {
-            if ( !isQObject( obj->className() ) )
+            if ( !isTQObject( obj->className() ) )
                 addType( obj->className() );
             kdDebug( 80001 ) << "Created from createWidget" << endl;
             return obj;
@@ -670,7 +670,7 @@ namespace KJSEmbed {
         // Custom objects
         obj = JSFactory::createObject( cname, parent, name );
         if ( obj ) {
-            if ( !isQObject( obj->className() ) )
+            if ( !isTQObject( obj->className() ) )
                 addType( obj->className() );
             kdDebug( 80001 ) << "Created from createObject" << endl;
             return obj;
@@ -679,7 +679,7 @@ namespace KJSEmbed {
         // Binding objects
         obj = JSFactory::createBinding( cname, parent, name );
         if ( obj ) {
-            if ( !isQObject( obj->className() ) )
+            if ( !isTQObject( obj->className() ) )
                 addType( obj->className() );
             kdDebug( 80001 ) << "Created from bindings" << endl;
             return obj;
@@ -689,22 +689,22 @@ namespace KJSEmbed {
         return 0;
     }
 
-    KParts::ReadOnlyPart *JSFactory::createROPart( const TQString &svc, TQObject *parent, const char *name ) {
+    KParts::ReadOnlyPart *JSFactory::createROPart( const TTQString &svc, TTQObject *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 TQString &svc, const TQString &con,
-            TQObject *parent, const char *name ) {
+    KParts::ReadOnlyPart *JSFactory::createROPart( const TTQString &svc, const TTQString &con,
+            TTQObject *parent, const char *name ) {
         kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " constraint " << con
         << " parent " << ( long ) parent << endl;
 
-        return createROPart( svc, con, parent, name, TQStringList() );
+        return createROPart( svc, con, parent, name, TTQStringList() );
     }
 
-    KParts::ReadOnlyPart *JSFactory::createROPart( const TQString &svc, const TQString &con,
-            TQObject *parent, const char *name,
-            const TQStringList &args ) {
+    KParts::ReadOnlyPart *JSFactory::createROPart( const TTQString &svc, const TTQString &con,
+            TTQObject *parent, const char *name,
+            const TTQStringList &args ) {
 #ifndef QT_ONLY
         kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " constraint " << con
         << " parent " << ( long ) parent
@@ -721,7 +721,7 @@ namespace KJSEmbed {
             return 0;
         }
 
-        TQObject *obj = fact->create( parent, name, "KParts::ReadOnlyPart", args );
+        TTQObject *obj = fact->create( parent, name, "KParts::ReadOnlyPart", args );
         addType( obj->className() );
         return static_cast<KParts::ReadOnlyPart *>( obj );
 #else // QT_ONLY
@@ -736,22 +736,22 @@ namespace KJSEmbed {
 
     }
 
-    KParts::ReadWritePart *JSFactory::createRWPart( const TQString &svc, TQObject *parent, const char *name ) {
+    KParts::ReadWritePart *JSFactory::createRWPart( const TTQString &svc, TTQObject *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 TQString &svc, const TQString &con,
-            TQObject *parent, const char *name ) {
+    KParts::ReadWritePart *JSFactory::createRWPart( const TTQString &svc, const TTQString &con,
+            TTQObject *parent, const char *name ) {
         kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " constraint " << con
         << " parent " << ( long ) parent << endl;
 
-        return createRWPart( svc, con, parent, name, TQStringList() );
+        return createRWPart( svc, con, parent, name, TTQStringList() );
     }
 
-    KParts::ReadWritePart *JSFactory::createRWPart( const TQString &svc, const TQString &con,
-            TQObject *parent, const char *name,
-            const TQStringList &args ) {
+    KParts::ReadWritePart *JSFactory::createRWPart( const TTQString &svc, const TTQString &con,
+            TTQObject *parent, const char *name,
+            const TTQStringList &args ) {
 #ifndef QT_ONLY
         kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " constraint " << con
         << " parent " << ( long ) parent
@@ -768,7 +768,7 @@ namespace KJSEmbed {
             return 0;
         }
 
-        TQObject *obj = fact->create( parent, name, "KParts::ReadWritePart", args );
+        TTQObject *obj = fact->create( parent, name, "KParts::ReadWritePart", args );
         addType( obj->className() );
         return static_cast<KParts::ReadWritePart *>( obj );
 #else // QT_ONLY
@@ -783,15 +783,15 @@ namespace KJSEmbed {
 
     }
 
-    TQWidget *JSFactory::loadUI( const TQString &uiFile, TQObject *connector, TQWidget *parent, const char *name ) {
-        return TQWidgetFactory::create( uiFile, connector, parent, name );
+    TTQWidget *JSFactory::loadUI( const TTQString &uiFile, TTQObject *connector, TTQWidget *parent, const char *name ) {
+        return TTQWidgetFactory::create( uiFile, connector, parent, name );
     }
 
-    TQStringList JSFactory::listBindingPlugins( KJS::ExecState *exec, KJS::Object &self ) {
+    TTQStringList JSFactory::listBindingPlugins( KJS::ExecState *exec, KJS::Object &self ) {
         Q_UNUSED( exec )
         Q_UNUSED( self )
-        TQStringList pluginList;
-        TQStringList allTypes = objtypes.keys();
+        TTQStringList pluginList;
+        TTQStringList 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::isQObject( const TQString &clazz ) const {
+    bool JSFactory::isTQObject( const TTQString &clazz ) const {
         if ( !isSupported( clazz ) )
             return false;
 
-        return ( objtypes[ clazz ] & TypeQObject );
+        return ( objtypes[ clazz ] & TypeTQObject );
     }
 
-    bool JSFactory::isValue( const TQString &clazz ) const {
+    bool JSFactory::isValue( const TTQString &clazz ) const {
         if ( !isSupported( clazz ) )
             return false;
 
         return objtypes[ clazz ] == TypeValue;
     }
 
-    bool JSFactory::isOpaque( const TQString &clazz ) const {
+    bool JSFactory::isOpaque( const TTQString &clazz ) const {
         if ( !isSupported( clazz ) )
             return false;
         return objtypes[ clazz ] == TypeOpaque;
     }
 
-    void JSFactory::addQObjectPlugin( const TQString &classname, KJSEmbed::Bindings::JSBindingPlugin* plugin ) {
+    void JSFactory::addTQObjectPlugin( const TTQString &classname, KJSEmbed::Bindings::JSBindingPlugin* plugin ) {
         if ( plugin ) {
-            addType( classname, TypeQObjectPlugin );
+            addType( classname, TypeTQObjectPlugin );
             d->plugins.insert( classname, plugin );
         }
     }
 
-    void JSFactory::addType( const TQString &clazz, uint prxtype ) {
+    void JSFactory::addType( const TTQString &clazz, uint prxtype ) {
         if ( prxtype == TypeInvalid ) {
             objtypes.remove( clazz );
             return ;
@@ -835,12 +835,12 @@ namespace KJSEmbed {
         objtypes[ clazz ] = prxtype;
     }
 
-    bool JSFactory::isSupported( const TQString &clazz ) const {
+    bool JSFactory::isSupported( const TTQString &clazz ) const {
         kdDebug() << "Checking " << clazz << endl;
         return objtypes.contains( clazz );
     }
 
-    uint JSFactory::proxyType( const TQString &clazz ) const {
+    uint JSFactory::proxyType( const TTQString &clazz ) const {
         if ( !isSupported( clazz ) )
             return TypeInvalid;
         return objtypes[ clazz ];
@@ -856,14 +856,14 @@ namespace KJSEmbed {
         addBindingPluginTypes( exec, parent );
     }
 
-    TQStringList JSFactory::types() const {
+    TTQStringList JSFactory::types() const {
         return objtypes.keys();
     }
 
     void JSFactory::addWidgetFactoryTypes( KJS::ExecState *exec, KJS::Object &parent ) {
-        TQStringList sl = TQWidgetFactory::widgets();
+        TTQStringList sl = TTQWidgetFactory::widgets();
 
-        for ( TQStringList::Iterator it = sl.begin(); it != sl.end(); ++it ) {
+        for ( TTQStringList::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[] = {
 
-                                     "TQSplitter", "TQScrollView", "TQCanvasView", "TQCanvas",
-                                     "TQObject", "TQTimer", "TQSplashScreen", "TQProgressDialog",
-                                     "TQLayout", "TQBoxLayout", "TQHBoxLayout", "TQVBoxLayout",
+                                     "TTQSplitter", "TTQScrollView", "TTQCanvasView", "TTQCanvas",
+                                     "TTQObject", "TTQTimer", "TTQSplashScreen", "TTQProgressDialog",
+                                     "TTQLayout", "TTQBoxLayout", "TTQHBoxLayout", "TTQVBoxLayout",
 #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[] = {
-                                     "TQTextStream",
+                                     "TTQTextStream",
                                      "TextStream",
-                                     "TQCanvasItem",
-                                     "TQCanvasText",
+                                     "TTQCanvasItem",
+                                     "TTQCanvasText",
                                      0
                                  };
 
@@ -934,7 +934,7 @@ namespace KJSEmbed {
         }
 
         // Create the custom added types.
-        TQDictIterator<KJSEmbed::Bindings::JSBindingBase> idx( d->opaqueTypes );
+        TTQDictIterator<KJSEmbed::Bindings::JSBindingBase> 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,101 +964,101 @@ namespace KJSEmbed {
 
     void JSFactory::addObjectTypes( KJS::ExecState *exec, KJS::Object & parent ) {
         const char * classes[] = {
-                                     "TQAccel",
-                                     "TQAccessibleObject",
-                                     "TQAction",
-                                     "TQActionGroup",
-                                     "TQApplication",
-                                     "QAquaStyle",
-                                     "QAssistantClient",
-                                     "QAxObject",
-                                     "QAxWidget",
-                                     "TQButton",
-                                     "QCDEStyle",
-                                     "QClipboard",
-                                     "QColorDialog",
-                                     "TQColorDrag",
-                                     "TQComboBox",
-                                     "TQCommonStyle",
-                                     "QCopChannel",
-                                     "TQDataPump",
-                                     "TQDateTimeEditBase",
-                                     "TQDesktopWidget",
-                                     "TQDns",
-                                     "TQDockArea",
-                                     "TQDockWindow",
-                                     "TQDoubleValidator",
-                                     "TQDragObject",
-                                     "TQEditorFactory",
-                                     "TQErrorMessage",
-                                     "TQEventLoop",
-                                     "TQFileDialog",
-                                     "TQFileIconProvider",
-                                     "QFontDialog",
-                                     "TQFtp",
-                                     "QGLWidget",
-                                     "TQGridLayout",
-                                     "TQGridView",
-                                     "TQHButtonGroup",
-                                     "TQHGroupBox",
-                                     "TQHeader",
-                                     "TQHttp",
-                                     "TQIconDrag",
-                                     "TQImageDrag",
-                                     "QInputDialog",
-                                     "TQIntValidator",
-                                     "TQLocalFs",
-                                     "QMacStyle",
-                                     "TQMenuBar",
-                                     "TQMessageBox",
-                                     "QMotif",
-                                     "QMotifDialog",
-                                     "TQMotifPlusStyle",
-                                     "TQMotifStyle",
-                                     "QMotifWidget",
-                                     "QNPInstance",
-                                     "QNPWidget",
-                                     "TQNetworkOperation",
-                                     "TQNetworkProtocol",
-                                     "TQObjectCleanupHandler",
-                                     "TQPlatinumStyle",
-                                     "TQProcess",
-                                     "TQPopupMenu",
-                                     "TQProgressDialog",
-                                     "TQRegExpValidator",
-                                     "QSGIStyle",
-                                     "TQServerSocket",
-                                     "QSessionManager",
-                                     "TQSignal",
-                                     "TQSignalMapper",
-                                     "TQSizeGrip",
-                                     "TQSocket",
-                                     "TQSocketNotifier",
-                                     "TQSound",
-                                     "TQSqlDatabase",
-                                     "TQSqlDriver",
-                                     "TQSqlEditorFactory",
-                                     "TQSqlForm",
-                                     "TQStatusBar",
-                                     "TQStoredDrag",
-                                     "TQStyle",
-                                     "TQStyleSheet",
-                                     "TQTabBar",
-                                     "TQTabDialog",
-                                     "TQTextDrag",
-                                     "TQToolBar",
-                                     "TQToolTipGroup",
-                                     "QTranslator",
-                                     "TQUriDrag",
-                                     "TQUrlOperator",
-                                     "TQVButtonGroup",
-                                     "TQVGroupBox",
-                                     "TQValidator",
-                                     "QWSKeyboardHandler",
-                                     "TQWindowsStyle",
-                                     "QWindowsXPStyle",
-                                     "TQWorkspace",
-                                     "QXtWidget",
+                                     "TTQAccel",
+                                     "TTQAccessibleObject",
+                                     "TTQAction",
+                                     "TTQActionGroup",
+                                     "TTQApplication",
+                                     "TQAquaStyle",
+                                     "TQAssistantClient",
+                                     "TQAxObject",
+                                     "TQAxWidget",
+                                     "TTQButton",
+                                     "TQCDEStyle",
+                                     "TQClipboard",
+                                     "TQColorDialog",
+                                     "TTQColorDrag",
+                                     "TTQComboBox",
+                                     "TTQCommonStyle",
+                                     "TQCopChannel",
+                                     "TTQDataPump",
+                                     "TTQDateTimeEditBase",
+                                     "TTQDesktopWidget",
+                                     "TTQDns",
+                                     "TTQDockArea",
+                                     "TTQDockWindow",
+                                     "TTQDoubleValidator",
+                                     "TTQDragObject",
+                                     "TTQEditorFactory",
+                                     "TTQErrorMessage",
+                                     "TTQEventLoop",
+                                     "TTQFileDialog",
+                                     "TTQFileIconProvider",
+                                     "TQFontDialog",
+                                     "TTQFtp",
+                                     "TQGLWidget",
+                                     "TTQGridLayout",
+                                     "TTQGridView",
+                                     "TTQHButtonGroup",
+                                     "TTQHGroupBox",
+                                     "TTQHeader",
+                                     "TTQHttp",
+                                     "TTQIconDrag",
+                                     "TTQImageDrag",
+                                     "TQInputDialog",
+                                     "TTQIntValidator",
+                                     "TTQLocalFs",
+                                     "TQMacStyle",
+                                     "TTQMenuBar",
+                                     "TTQMessageBox",
+                                     "TQMotif",
+                                     "TQMotifDialog",
+                                     "TTQMotifPlusStyle",
+                                     "TTQMotifStyle",
+                                     "TQMotifWidget",
+                                     "TQNPInstance",
+                                     "TQNPWidget",
+                                     "TTQNetworkOperation",
+                                     "TTQNetworkProtocol",
+                                     "TTQObjectCleanupHandler",
+                                     "TTQPlatinumStyle",
+                                     "TTQProcess",
+                                     "TTQPopupMenu",
+                                     "TTQProgressDialog",
+                                     "TTQRegExpValidator",
+                                     "TQSGIStyle",
+                                     "TTQServerSocket",
+                                     "TQSessionManager",
+                                     "TTQSignal",
+                                     "TTQSignalMapper",
+                                     "TTQSizeGrip",
+                                     "TTQSocket",
+                                     "TTQSocketNotifier",
+                                     "TTQSound",
+                                     "TTQSqlDatabase",
+                                     "TTQSqlDriver",
+                                     "TTQSqlEditorFactory",
+                                     "TTQSqlForm",
+                                     "TTQStatusBar",
+                                     "TTQStoredDrag",
+                                     "TTQStyle",
+                                     "TTQStyleSheet",
+                                     "TTQTabBar",
+                                     "TTQTabDialog",
+                                     "TTQTextDrag",
+                                     "TTQToolBar",
+                                     "TTQToolTipGroup",
+                                     "TQTranslator",
+                                     "TTQUriDrag",
+                                     "TTQUrlOperator",
+                                     "TTQVButtonGroup",
+                                     "TTQVGroupBox",
+                                     "TTQValidator",
+                                     "TQWSKeyboardHandler",
+                                     "TTQWindowsStyle",
+                                     "TQWindowsXPStyle",
+                                     "TTQWorkspace",
+                                     "TQXtWidget",
 
                                      0
                                  };
@@ -1068,20 +1068,20 @@ namespace KJSEmbed {
                 addType( classes[ i ] );
         }
                 // Create the custom added types.
-        TQDictIterator<KJSEmbed::Bindings::JSBindingBase> idx( d->objectTypes );
+        TTQDictIterator<KJSEmbed::Bindings::JSBindingBase> 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 ) );
-            addType( idx.currentKey(), TypeQObject );
+            addType( idx.currentKey(), TypeTQObject );
         }
     }
 
-    void JSFactory::registerOpaqueType( const TQString & className, KJSEmbed::Bindings::JSBindingBase * bindingFactory )
+    void JSFactory::registerOpaqueType( const TTQString & className, KJSEmbed::Bindings::JSBindingBase * bindingFactory )
     {
         d->opaqueTypes.insert(className,bindingFactory);
     } 
 
-    void JSFactory::unregisterOpaqueType( const TQString & className )
+    void JSFactory::unregisterOpaqueType( const TTQString & className )
     {
         d->opaqueTypes.remove(className);
     }
@@ -1100,12 +1100,12 @@ namespace KJSEmbed {
 	   }
 	}
     }
-    void JSFactory::registerObjectType( const TQString & className, KJSEmbed::Bindings::JSBindingBase * bindingFactory )
+    void JSFactory::registerObjectType( const TTQString & className, KJSEmbed::Bindings::JSBindingBase * bindingFactory )
     {
         d->objectTypes.insert(className,bindingFactory);
     } 
 
-    void JSFactory::unregisterObjectType( const TQString & className )
+    void JSFactory::unregisterObjectType( const TTQString & className )
     {
         d->objectTypes.remove(className);
     }
diff --git a/kjsembed/jsfactory.h b/kjsembed/jsfactory.h
index 726a8344..2b77011b 100644
--- a/kjsembed/jsfactory.h
+++ b/kjsembed/jsfactory.h
@@ -29,10 +29,10 @@
 #include <kjs/interpreter.h>
 #include <kjs/object.h>
 
-class TQEvent;
-class TQObject;
-class TQWidget;
-class TQTextStream;
+class TTQEvent;
+class TTQObject;
+class TTQWidget;
+class TTQTextStream;
 
 namespace KParts {
     class ReadOnlyPart;
@@ -69,11 +69,11 @@ public:
      */
     enum ProxyTypes {
 	TypeInvalid=0,
-        TypeQObject=1,
+        TypeTQObject=1,
         TypeValue=2,
 	TypeOpaque=4,
 	TypePlugin=8,
-	TypeQObjectPlugin=9 /*TypeObject|TypePlugin*/
+	TypeTQObjectPlugin=9 /*TypeObject|TypePlugin*/
     };
 
     /** Creates a factory object for the specified part. */
@@ -96,18 +96,18 @@ public:
     //
 
     /** Creates an object of the specified class, then returns a proxy. */
-    KJS::Object create( KJS::ExecState *exec, const TQString &classname, const KJS::List &args );
+    KJS::Object create( KJS::ExecState *exec, const TTQString &classname, const KJS::List &args );
 
     /** Creates a proxy object for the specified target with the specified context. */
-    KJS::Object createProxy( KJS::ExecState *exec, TQObject *target,
+    KJS::Object createProxy( KJS::ExecState *exec, TTQObject *target,
 			     const JSObjectProxy *context=0 ) const;
 
     /** Creates a proxy object for the specified target with the specified context. */
-    KJS::Object createProxy( KJS::ExecState *exec, TQTextStream *target,
+    KJS::Object createProxy( KJS::ExecState *exec, TTQTextStream *target,
 			     const JSObjectProxy *context=0 ) const;
 
     /** Creates a proxy object for the specified target with the specified context. */
-    KJS::Object createProxy( KJS::ExecState *exec, TQEvent *target,
+    KJS::Object createProxy( KJS::ExecState *exec, TTQEvent *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 TQString &className, KJSEmbed::Bindings::JSBindingBase *bindingFactory);
+    void registerOpaqueType( const TTQString &className, KJSEmbed::Bindings::JSBindingBase *bindingFactory);
 
     /**
     * Remove an opaque type from the system.
      */
-    void unregisterOpaqueType( const TQString &className );
+    void unregisterOpaqueType( const TTQString &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 TQObject proxy factory with the with the factory.
+    * Registers a TTQObject 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 TQString &className, KJSEmbed::Bindings::JSBindingBase *bindingFactory);
+    void registerObjectType( const TTQString &className, KJSEmbed::Bindings::JSBindingBase *bindingFactory);
 
     /**
     * Remove an opaque type from the system.
      */
-    void unregisterObjectType( const TQString &className );
+    void unregisterObjectType( const TTQString &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 TQString &svc, TQObject *parent=0, const char *name=0 );
+    KParts::ReadOnlyPart *createROPart( const TTQString &svc, TTQObject *parent=0, const char *name=0 );
 
     /**
      * Creates a ReadOnlyPart that views the specified service type and matches
      * the specified constraint.
      */
-    KParts::ReadOnlyPart *createROPart( const TQString &svc, const TQString &constraint,
-					TQObject *parent=0, const char *name=0 );
+    KParts::ReadOnlyPart *createROPart( const TTQString &svc, const TTQString &constraint,
+					TTQObject *parent=0, const char *name=0 );
 
     /**
      * Creates a ReadOnlyPart that views the specified service type and matches
      * the specified constraint.
      */
-    KParts::ReadOnlyPart *createROPart( const TQString &svc, const TQString &constraint,
-					TQObject *parent, const char *name,
-					const TQStringList &args );
+    KParts::ReadOnlyPart *createROPart( const TTQString &svc, const TTQString &constraint,
+					TTQObject *parent, const char *name,
+					const TTQStringList &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 TQString &svc, TQObject *parent=0, const char *name=0 );
+    KParts::ReadWritePart *createRWPart( const TTQString &svc, TTQObject *parent=0, const char *name=0 );
 
     /**
      * Creates a ReadWritePart that edits the specified service type and matches
      * the specified constraint.
      */
-    KParts::ReadWritePart *createRWPart( const TQString &svc, const TQString &constraint,
-					 TQObject *parent=0, const char *name=0 );
+    KParts::ReadWritePart *createRWPart( const TTQString &svc, const TTQString &constraint,
+					 TTQObject *parent=0, const char *name=0 );
 
     /**
      * Creates a ReadWritePart that edits the specified service type and matches
      * the specified constraint.
      */
-    KParts::ReadWritePart *createRWPart( const TQString &svc, const TQString &constraint,
-					 TQObject *parent, const char *name,
-					 const TQStringList &args );
+    KParts::ReadWritePart *createRWPart( const TTQString &svc, const TTQString &constraint,
+					 TTQObject *parent, const char *name,
+					 const TTQStringList &args );
 
     /**
      * Loads the widget defined in the specified .ui file. If the widget
      * cannot be created then 0 is returned.
      */
-    TQWidget *loadUI( const TQString &uiFile, TQObject *connector=0, TQWidget *parent=0, const char *name=0 );
+    TTQWidget *loadUI( const TTQString &uiFile, TTQObject *connector=0, TTQWidget *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.
     */
-    TQStringList listBindingPlugins( KJS::ExecState *exec, KJS::Object &self);
+    TTQStringList 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 TQString &classname) const;
+    bool isBindingPlugin(const TTQString &classname) const;
     /**
     * Creates the actual object from the binding plugin.
     */
-    KJS::Object createBindingPlugin(KJS::ExecState *exec, const TQString &classname, const KJS::List &args );
+    KJS::Object createBindingPlugin(KJS::ExecState *exec, const TTQString &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 TQString &clazz ) const;
+    bool isSupported( const TTQString &clazz ) const;
 
     /**
      * Returns true iff the class with the specified name is handled with the
-     * TQObject proxy type.
+     * TTQObject proxy type.
      */
-    bool isQObject( const TQString &clazz ) const;
+    bool isTQObject( const TTQString &clazz ) const;
 
     /**
      * Returns true iff the class with the specified name is handled with the
      * value proxy type.
      */
-    bool isValue( const TQString &clazz ) const;
+    bool isValue( const TTQString &clazz ) const;
 
     /**
      * Returns true iff the class with the specified name is handled with the
      * opaque proxy type.
      */
-    bool isOpaque( const TQString &clazz ) const;
+    bool isOpaque( const TTQString &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 TQString &clazz ) const;
+    uint proxyType( const TTQString &clazz ) const;
 
 
     /**
      *Allows adding of an already loaded binding plugin for a certain class type
      *
      */
-    void addQObjectPlugin(const TQString &classname, KJSEmbed::Bindings::JSBindingPlugin* plugin);
+    void addTQObjectPlugin(const TTQString &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 TQString &clazz, uint proxytype=JSFactory::TypeQObject );
+    void addType( const TTQString &clazz, uint proxytype=JSFactory::TypeTQObject );
 
     /** Adds the types defined by the factory to the specified parent. */
     void addTypes( KJS::ExecState *exec, KJS::Object &parent );
 
-    TQStringList types() const;
+    TTQStringList 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 TQString &cname, const KJS::List &args );
+    KJS::Object createValue( KJS::ExecState *exec, const TTQString &cname, const KJS::List &args );
 
     /**
-     * Creates an instance of a TQObject subclass. If the instance cannot be
+     * Creates an instance of a TTQObject subclass. If the instance cannot be
      * created then 0 is returned.
      */
-    TQObject *create( const TQString &classname, TQObject *parent=0, const char *name=0  );
+    TTQObject *create( const TTQString &classname, TTQObject *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 TQString &cname, const KJS::List &args );
+    KJS::Object createOpaque( KJS::ExecState *exec, const TTQString &cname, const KJS::List &args );
 
 
-    /** Creates an instance of the named binding TQObject. */
-    TQObject *createBinding( const TQString &cname, TQObject *parent, const char *name );
+    /** Creates an instance of the named binding TTQObject. */
+    TTQObject *createBinding( const TTQString &cname, TTQObject *parent, const char *name );
 
     /**
-     * Creates an instance of the named TQObject. This method is only used for
+     * Creates an instance of the named TTQObject. This method is only used for
      * non-widget objects.
      */
-    TQObject *createObject( const TQString &cname, TQObject *parent, const char *name );
+    TTQObject *createObject( const TTQString &cname, TTQObject *parent, const char *name );
 
     /**
-     * Creates an instance of the named TQWidget. Note that this method is only
-     * used to create widgets that are not supported by TQWidgetFactory.
+     * Creates an instance of the named TTQWidget. Note that this method is only
+     * used to create widgets that are not supported by TTQWidgetFactory.
      */
-    TQWidget *createWidget( const TQString &cname, TQWidget *parent, const char *name );
+    TTQWidget *createWidget( const TTQString &cname, TTQWidget *parent, const char *name );
 
 private:
     
-    /** Adds the types defined by TQWidgetFactory to the specified parent. */
+    /** Adds the types defined by TTQWidgetFactory to the specified parent. */
     void addWidgetFactoryTypes( KJS::ExecState *exec, KJS::Object &parent );
 
-    /** Adds support for custom TQObject types to the specified parent. */
+    /** Adds support for custom TTQObject types to the specified parent. */
     void addCustomTypes( KJS::ExecState *exec, KJS::Object &parent );
 
-    /** Adds support for TQObject binding types to the specified parent. */
+    /** Adds support for TTQObject binding types to the specified parent. */
     void addBindingTypes( KJS::ExecState *exec, KJS::Object &parent );
 
     /**
-     * Adds support for any TQObject types that are known about, but have no
+     * Adds support for any TTQObject 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;
-    TQMap<TQString,uint> objtypes;
+    TTQMap<TTQString,uint> objtypes;
     class JSFactoryPrivate *d;
 };
 
diff --git a/kjsembed/jsfactory_imp.cpp b/kjsembed/jsfactory_imp.cpp
index 4c9fea00..dd999610 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 TQString &p )
+JSFactoryImp::JSFactoryImp( KJS::ExecState *exec, JSFactory *jsfact, int mid, const TTQString &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;
 
-	TQString msg = i18n( "JSFactoryImp has no constructor with id '%1'." ).arg( id );
+	TTQString 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 )
 {
-    TQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TQString::null;
-    TQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TTQString::null;
+    TTQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TTQString::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() );
-	TQObject *cqo = cproxy ? cproxy->object() : 0;
+	TTQObject *cqo = cproxy ? cproxy->object() : 0;
 
 	JSObjectProxy *proxy = JSProxy::toObjectProxy( args[2].imp() );
-	TQWidget *qw = proxy ? proxy->widget() : 0;
-	TQWidget *obj = fact->loadUI( arg0, cqo, qw, arg1.latin1() );
+	TTQWidget *qw = proxy ? proxy->widget() : 0;
+	TTQWidget *obj = fact->loadUI( arg0, cqo, qw, arg1.latin1() );
 	if ( obj )
 	{
 		KJS::Object parentObject = fact->createProxy( exec, obj );
 	// Add properties for child widgets.
-		const TQObjectList *lst = obj->children();
+		const TTQObjectList *lst = obj->children();
 		if ( lst )
 		{
-			TQObjectListIt it( *lst );
-			TQObject *child;
+			TTQObjectListIt it( *lst );
+			TTQObject *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;
 	}
 
-	TQString msg = i18n( "Unable to create ui from file '%1'." ).arg(arg0);
+	TTQString 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;
-	TQObject *qo = 0;
-	TQObject *ropart = 0;
+	TTQObject *qo = 0;
+	TTQObject *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;
-	    TQStringList slist = extractQStringList( exec, args, 4 );
+	    TTQStringList 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 );
 
-	TQString msg = i18n( "Unable to create read-only part for service '%1'." ).arg(arg0);
+	TTQString 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;
-	TQStringList widgets = TQWidgetFactory::widgets();
-	for ( TQStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) {
+	TTQStringList widgets = TTQWidgetFactory::widgets();
+	for ( TTQStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) {
 	    l.append( KJS::String( *it ) );
 	}
 
@@ -168,9 +168,9 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
 	return KJS::Boolean( fact->isSupported( arg0 ) );
 	break;
     }
-    case MethodIsQObject:
+    case MethodIsTQObject:
     {
-	return KJS::Boolean( fact->isQObject( arg0 ) );
+	return KJS::Boolean( fact->isTQObject( arg0 ) );
 	break;
     }
     case MethodIsOpaque:
@@ -186,8 +186,8 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
     case MethodTypes:
     {
 	KJS::List l;
-	TQStringList types = fact->types();
-	for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
+	TTQStringList types = fact->types();
+	for ( TTQStringList::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;
-	TQObject *qo = 0;
-	TQObject *rwpart = 0;
+	TTQObject *qo = 0;
+	TTQObject *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 );
 
-	TQString msg = i18n( "Unable to create read-write part for service '%1'." ).arg(arg0);
+	TTQString 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;
-	TQString msg = i18n( "JSFactoryImp has no method with id '%1'." ).arg( id );
+	TTQString 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(TQObject *obj, KJS::Object &parent)
+void JSFactoryImp::publishChildren(TTQObject *obj, KJS::Object &parent)
 {
-	TQString name = obj->name();
+	TTQString name = obj->name();
 	name.remove(":");
 	name.remove(" ");
 	name.remove("<");
@@ -263,10 +263,10 @@ void JSFactoryImp::publishChildren(TQObject *obj, KJS::Object &parent)
 	KJS::Object newParent = fact->part()->addObject( obj, parent, name.latin1() );
 	JSProxy::toProxy( newParent.imp() ) ->setOwner( JSProxy::JavaScript );
 
-	// Hack to publish QToolBoxes children
-	TQToolBox *box = dynamic_cast<TQToolBox*>(obj);
-	TQTabWidget *tab = dynamic_cast<TQTabWidget*>(obj);
-	TQWizard *wiz = dynamic_cast<TQWizard*>(obj);
+	// Hack to publish TQToolBoxes children
+	TTQToolBox *box = dynamic_cast<TTQToolBox*>(obj);
+	TTQTabWidget *tab = dynamic_cast<TTQTabWidget*>(obj);
+	TTQWizard *wiz = dynamic_cast<TTQWizard*>(obj);
 
 	if( box ) {
 		int count = box->count();
@@ -281,10 +281,10 @@ void JSFactoryImp::publishChildren(TQObject *obj, KJS::Object &parent)
 		for( int idx = 0; idx < count; ++idx)
 		publishChildren(wiz->page(idx),newParent);
 	} else {
-		const TQObjectList *lst = obj->children();
+		const TTQObjectList *lst = obj->children();
 		if ( lst ) {
-			TQObjectListIt it( *lst );
-			TQObject *child;
+			TTQObjectListIt it( *lst );
+			TTQObject *child;
 			while ( (child = it.current()) != 0 ) {
 				publishChildren( child, newParent);
 				++it;
diff --git a/kjsembed/jsfactory_imp.h b/kjsembed/jsfactory_imp.h
index 53ea1143..fa23127d 100644
--- a/kjsembed/jsfactory_imp.h
+++ b/kjsembed/jsfactory_imp.h
@@ -52,7 +52,7 @@ public:
 	MethodWidgets,
 	MethodTypes,
 	MethodIsSupported,
-	MethodIsQObject,
+	MethodIsTQObject,
 	MethodIsValue,
 	MethodIsOpaque,
 	MethodListPlugins,
@@ -60,10 +60,10 @@ public:
 	MethodCreateObject
     };
 
-    JSFactoryImp( KJS::ExecState *exec, JSFactory *fact, int id, const TQString &param=TQString::null );
+    JSFactoryImp( KJS::ExecState *exec, JSFactory *fact, int id, const TTQString &param=TTQString::null );
     ~JSFactoryImp();
 
-    TQString parameter() const { return param; }
+    TTQString 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(TQObject *obj, KJS::Object &parent);
+    void publishChildren(TTQObject *obj, KJS::Object &parent);
     JSFactory *fact;
     uint id;
-    TQString param;
+    TTQString param;
     KJS::Value defaultVal;
     class JSFactoryImpPrivate *d;
 };
diff --git a/kjsembed/jsobjecteventproxy.cpp b/kjsembed/jsobjecteventproxy.cpp
index b817b42d..3ebdee1f 100644
--- a/kjsembed/jsobjecteventproxy.cpp
+++ b/kjsembed/jsobjecteventproxy.cpp
@@ -34,11 +34,11 @@
 namespace KJSEmbed {
 
 // We'll need to increase this if we need to support any custom events
-static const TQEvent::Type QEVENT_TYPE_MAX = TQEvent::TabletRelease;
+static const TTQEvent::Type TQEVENT_TYPE_MAX = TTQEvent::TabletRelease;
 
 JSObjectEventProxy::JSObjectEventProxy( JSObjectProxy *parent, const char *name )
-    : TQObject( parent->object(), name ? name : "jsobjecteventproxy" ),
-      proxy( parent ), eventMask( QEVENT_TYPE_MAX ), refcount(0)
+    : TTQObject( 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( TQEvent::Type t ) const
+bool JSObjectEventProxy::isFiltered( TTQEvent::Type t ) const
 {
     return eventMask.testBit( t );
 }
 
-void JSObjectEventProxy::addFilter( TQEvent::Type t )
+void JSObjectEventProxy::addFilter( TTQEvent::Type t )
 {
     if ( !refcount )
 	proxy->object()->installEventFilter( this );
@@ -65,7 +65,7 @@ void JSObjectEventProxy::addFilter( TQEvent::Type t )
     kdDebug(80001) << "JSObjectEventProxy::addFilter done" << endl;
 }
 
-void JSObjectEventProxy::removeFilter( TQEvent::Type t )
+void JSObjectEventProxy::removeFilter( TTQEvent::Type t )
 {
     eventMask.clearBit( t );
     refcount--;
@@ -77,7 +77,7 @@ void JSObjectEventProxy::removeFilter( TQEvent::Type t )
     kdDebug(80001) << "JSObjectEventProxy::removeFilter done" << endl;
 }
 
-bool JSObjectEventProxy::eventFilter( TQObject * /*watched*/, TQEvent *e )
+bool JSObjectEventProxy::eventFilter( TTQObject * /*watched*/, TTQEvent *e )
 {
     if ( isFiltered(e->type()) )
 	callHandler( e );
@@ -85,7 +85,7 @@ bool JSObjectEventProxy::eventFilter( TQObject * /*watched*/, TQEvent *e )
     return false;
 }
 
-KJS::Value JSObjectEventProxy::callHandler( TQEvent *e )
+KJS::Value JSObjectEventProxy::callHandler( TTQEvent *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( TQEvent *e )
     KJS::Object fun = jsobj.get(exec, *id ).toObject( exec );
 
     if ( !fun.implementsCall() ) {
-      TQString msg = i18n( "Bad event handler: Object %1 Identifier %2 Method %3 Type: %4." )
+      TTQString 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 2ef662ae..e05c2b1f 100644
--- a/kjsembed/jsobjecteventproxy.h
+++ b/kjsembed/jsobjecteventproxy.h
@@ -32,12 +32,12 @@ namespace KJSEmbed {
 class JSObjectProxy;
 
 /**
- * Filters events for a TQObject and forwards them to a JS handler.
+ * Filters events for a TTQObject and forwards them to a JS handler.
  *
  * @version $Id$
  * @author Richard Moore, rich@kde.org
  */
-class KJSEMBED_EXPORT JSObjectEventProxy : public QObject
+class KJSEMBED_EXPORT JSObjectEventProxy : public TQObject
 {
     Q_OBJECT
 
@@ -46,26 +46,26 @@ public:
     virtual ~JSObjectEventProxy();
 
     /** Returns true iff we forward the event type to JS. */
-    bool isFiltered( TQEvent::Type t ) const;
+    bool isFiltered( TTQEvent::Type t ) const;
 
     /** Adds an event type to those we forward to JS. */
-    void addFilter( TQEvent::Type t );
+    void addFilter( TTQEvent::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( TQEvent::Type t );
+    void removeFilter( TTQEvent::Type t );
 
     /** Reimplemented to forward events to JS. */
-    bool eventFilter ( TQObject *watched, TQEvent *e );
+    bool eventFilter ( TTQObject *watched, TTQEvent *e );
 
 protected:
-    KJS::Value callHandler( TQEvent *e );
+    KJS::Value callHandler( TTQEvent *e );
 
 private:
     JSObjectProxy *proxy;
-    TQBitArray eventMask;
+    TTQBitArray eventMask;
     uint refcount;
     class JSObjectEventProxyPrivate *d;
 };
diff --git a/kjsembed/jsobjectproxy.cpp b/kjsembed/jsobjectproxy.cpp
index 8b7d3cb7..e7d1e5d0 100644
--- a/kjsembed/jsobjectproxy.cpp
+++ b/kjsembed/jsobjectproxy.cpp
@@ -53,19 +53,19 @@ namespace KJSEmbed {
 
     typedef Bindings::JSObjectProxyImp JSObjectProxyImp;
 
-    JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TQObject *target, TQObject *r, const JSSecurityPolicy *sp )
+    JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TTQObject *target, TTQObject *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, TQObject *target, TQObject *r )
+    JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TTQObject *target, TTQObject *r )
             : JSProxy( JSProxy::ObjectProxy ),
     jspart( part ), js( part->interpreter() ), obj( target ), root( r ) {
         policy = JSSecurityPolicy::defaultPolicy();
     }
 
-    JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TQObject *target )
+    JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TTQObject *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();
         }
 
-        TQString s( "%1 (%2)" );
+        TTQString 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
-            TQString prop = p.ustring().qstring();
-            TQMetaObject *meta = obj->metaObject();
+            TTQString prop = p.ustring().qstring();
+            TTQMetaObject *meta = obj->metaObject();
 
             if ( meta->findProperty( p.ascii(), true ) != -1 ) {
-                TQVariant val = obj->property( prop.ascii() );
+                TTQVariant 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
-        TQMetaObject *meta = obj->metaObject();
+        TTQMetaObject *meta = obj->metaObject();
         int propIndex = meta->findProperty( p.ascii(), true );
         if ( propIndex != -1 ) {
-            TQVariant val = convertToVariant( exec, v );
+            TTQVariant 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;
-        TQObject *o = obj;
+        TTQObject *o = obj;
         Bindings::BindingObject *bo = dynamic_cast<Bindings::BindingObject *>( 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 ) {
-        TQMetaObject * mo = obj->metaObject();
-        TQStrList enumList = mo->enumeratorNames( true );
+        TTQMetaObject * mo = obj->metaObject();
+        TTQStrList enumList = mo->enumeratorNames( true );
 
-        for ( TQStrListIterator iter( enumList ); iter.current(); ++iter ) {
+        for ( TTQStrListIterator iter( enumList ); iter.current(); ++iter ) {
 
-            const QMetaEnum *me = mo->enumerator( iter.current(), true );
+            const TQMetaEnum *me = mo->enumerator( iter.current(), true );
             for ( uint i = 0 ; i < me->count ; i++ ) {
-                TQCString key( ( me->items ) [ i ].key );
+                TTQCString key( ( me->items ) [ i ].key );
                 int val = ( me->items ) [ i ].value;
                 object.put( exec, key.data(), KJS::Number( val ), KJS::ReadOnly );
             }
@@ -243,22 +243,22 @@ namespace KJSEmbed {
 
     void JSObjectProxy::addBindingsSlots( KJS::ExecState *exec, KJS::Object &object ) {
         // Publish slots with supported signatures as methods.
-        TQMetaObject * mo = obj->metaObject();
-        TQStrList slotList( mo->slotNames( true ) );
-        for ( TQStrListIterator iter( slotList ); iter.current(); ++iter ) {
+        TTQMetaObject * mo = obj->metaObject();
+        TTQStrList slotList( mo->slotNames( true ) );
+        for ( TTQStrListIterator iter( slotList ); iter.current(); ++iter ) {
             addSlotBinding( iter.current(), exec, object );
         }
     }
 
-    void JSObjectProxy::addSlotBinding( const TQCString &name, KJS::ExecState *exec, KJS::Object &object ) {
+    void JSObjectProxy::addSlotBinding( const TTQCString &name, KJS::ExecState *exec, KJS::Object &object ) {
         // Lookup and bind slot
-        TQMetaObject * mo = obj->metaObject();
+        TTQMetaObject * mo = obj->metaObject();
         int slotid = mo->findSlot( name.data(), true );
         if ( slotid == -1 )
             return ;
 
-        const QMetaData *md = mo->slot( slotid, true );
-        if ( md->access != QMetaData::Public )
+        const TQMetaData *md = mo->slot( slotid, true );
+        if ( md->access != TQMetaData::Public )
             return ;
 
         // Find signature
@@ -267,16 +267,16 @@ namespace KJSEmbed {
         if ( id < 0 )
             return ;
 
-        TQCString jsname = name;
+        TTQCString jsname = name;
         jsname.detach();
-        jsname.replace( TQRegExp( "\\([^\\)]*\\)" ), "" );
+        jsname.replace( TTQRegExp( "\\([^\\)]*\\)" ), "" );
 
         // Find the return type, we only care if it is a pointer type
-        const QUMethod *m = md->method;
+        const TQUMethod *m = md->method;
         const char *retclass = 0;
-        TQCString ptr( "ptr" );
+        TTQCString ptr( "ptr" );
 
-        if ( m->count && ( m->parameters->inOut == QUParameter::Out )
+        if ( m->count && ( m->parameters->inOut == TQUParameter::Out )
                 && ( ptr == m->parameters->type->desc() ) ) {
             retclass = ( const char * ) m->parameters->typeExtra;
             //  kdDebug(80001) << "Return type is a pointer, type " << retclass << endl;
@@ -291,8 +291,8 @@ namespace KJSEmbed {
             object.put( exec, KJS::Identifier( jsname.data() ), KJS::Object( imp ) );
         } else {
             // The identifier has already been used
-            TQString s( name );
-            TQCString cs = TQString( "%1%2" ).arg( jsname ).arg( s.contains( ',' ) + 1 ).ascii();
+            TTQString s( name );
+            TTQCString cs = TTQString( "%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 8e620e2a..fde60c61 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 TQObject.
+ * A JS object that provides a binding to a TTQObject.
  * <h3>Introduction</h3>
  * This class defines a @ref KJS::ObjectImp that allows scripts to access
- * the properties of a TQObject. The scripts can also create child objects,
+ * the properties of a TTQObject. 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/TQObject bridge.
+ * tree in a similar manner to the DCOP/TTQObject bridge.
  * <h3>Example Usage</h3>
  * The following example creates a @ref KJS::ObjectImp that provides
- * a binding to the properties of a @ref TQLineEdit . This binding is
+ * a binding to the properties of a @ref TTQLineEdit . This binding is
  * then used to create a property 'edit' for the object 'jsparent'.
  * <pre>
  *
- *   TQLineEdit *edit = new TQLineEdit();
+ *   TTQLineEdit *edit = new TTQLineEdit();
  *   KJSEmbed::JSObjectProxy *proxy = new KJSEmbed::JSObjectProxy( js, edit );
  *   jsparent.put( js->globalExec(), "edit", proxy );
  *
@@ -66,7 +66,7 @@ class JSObjectEventProxy;
  * property the following tests are performed:
  * <ul>
  * <li>Does this request come from the correct @ref KJS::Interpreter?
- * <li>Is the script allowed to access the specified QObject?
+ * <li>Is the script allowed to access the specified TQObject?
  * <li>Is the script allowed to access the specified property?
  * </ul>
  * The @ref KJSEmbed::JSSecurityPolicy class decides if the request should
@@ -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 TQObject that is descended the target and no others.
+     * access any TTQObject that is descended the target and no others.
      */
-    JSObjectProxy( KJSEmbedPart *part, TQObject *target );
+    JSObjectProxy( KJSEmbedPart *part, TTQObject *target );
 
     /**
      * Create a JS binding to the target object. The binding will allow scripts to
-     * access any TQObject that is descended from the specified root. If the specified
+     * access any TTQObject that is descended from the specified root. If the specified
      * root is 0 then access is granted to all objects.
      */
-    JSObjectProxy( KJSEmbedPart *part, TQObject *target, TQObject *root );
+    JSObjectProxy( KJSEmbedPart *part, TTQObject *target, TTQObject *root );
 
     /**
      * Create a JS binding to the target object. The binding will allow scripts to
-     * access any TQObject that is descended from the specified root, according to
+     * access any TTQObject 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, TQObject *target, TQObject *root, const JSSecurityPolicy *sp );
+    JSObjectProxy( KJSEmbedPart *part, TTQObject *target, TTQObject *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. */
-    TQObject *rootObject() const { return root; }
+    TTQObject *rootObject() const { return root; }
 
-    /** Returns the TQObject the proxy is attached to. */
-    TQObject *object() const { return obj; }
+    /** Returns the TTQObject the proxy is attached to. */
+    TTQObject *object() const { return obj; }
 
     /** Returns the className of the proxied object */
-    TQString typeName() const { return obj->className(); }
+    TTQString typeName() const { return obj->className(); }
 
-    /** Returns the associated TQWidget, or 0 if the object is not a widget. */
-    TQWidget *widget() const
+    /** Returns the associated TTQWidget, or 0 if the object is not a widget. */
+    TTQWidget *widget() const
 	{
-	    TQObject *w = obj;
-	    return (w && w->isWidgetType()) ? static_cast<TQWidget *>(w) : 0;
+	    TTQObject *w = obj;
+	    return (w && w->isWidgetType()) ? static_cast<TTQWidget *>(w) : 0;
 	}
 
     //void *toVoidStar() { return obj; }
     //template<class T>
-    //T *toNative(){ return dynamic_cast<TQObject*>(obj); }
+    //T *toNative(){ return dynamic_cast<TTQObject*>(obj); }
 
     /** Returns true iff the content of this proxy inherits the specified base-class. */
     bool inherits( const char *clazz ) { return obj->isA( clazz ); }
@@ -152,8 +152,8 @@ public:
     virtual KJS::UString toString( KJS::ExecState *exec ) const;
 
     /**
-     * Adds methods for traversing the TQObject tree to the specified
-     * @ref KJS::Object . Only QObjects descended from the root specified
+     * Adds methods for traversing the TTQObject 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.
      * <ul>
@@ -180,14 +180,14 @@ protected:
 private:
     bool isAllowed( KJS::Interpreter *js ) const;
 
-    void addSlotBinding( const TQCString &name, KJS::ExecState *exec, KJS::Object &object );
+    void addSlotBinding( const TTQCString &name, KJS::ExecState *exec, KJS::Object &object );
 
 private:
     KJSEmbedPart *jspart;
     KJS::Interpreter *js;
-    TQGuardedPtr<TQObject> obj;
-    TQGuardedPtr<TQObject> root;
-    TQGuardedPtr<JSObjectEventProxy> evproxy;
+    TTQGuardedPtr<TTQObject> obj;
+    TTQGuardedPtr<TTQObject> root;
+    TTQGuardedPtr<JSObjectEventProxy> evproxy;
     const JSSecurityPolicy *policy;
     class JSObjectProxyPrivate *d;
     friend class Bindings::JSObjectProxyImp;
diff --git a/kjsembed/jsobjectproxy_imp.cpp b/kjsembed/jsobjectproxy_imp.cpp
index dc94aa73..5e11e2c3 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 TQCString &name, JSObjectProxy *parent )
+				    int mid, const TTQCString &name, JSObjectProxy *parent )
     : JSProxyImp(exec), id(mid), slotname(name), proxy(parent), obj(parent->obj)
 {
 }
 
 JSObjectProxyImp::JSObjectProxyImp( KJS::ExecState *exec,
-				    int mid, int sid, const TQCString &name, JSObjectProxy *parent )
+				    int mid, int sid, const TTQCString &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 TQCString &name,
+				    int mid, const char *ret, int sid, const TTQCString &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 TQObjectList *kids = obj->children();
+    const TTQObjectList *kids = obj->children();
     if ( kids ) {
-        TQObjectList l( *kids );
+        TTQObjectList l( *kids );
 
 	for ( uint i = 0 ; i < l.count() ; i++ ) {
-	    TQObject *child = l.at( i );
-	    TQCString nm = ( child ? child->name() : "<null>" );
-	    items.append( KJS::String( TQString(nm) ) );
+	    TTQObject *child = l.at( i );
+	    TTQCString nm = ( child ? child->name() : "<null>" );
+	    items.append( KJS::String( TTQString(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;
-    TQMetaObject *mo = obj->metaObject();
-    TQStrList propList( mo->propertyNames( true ) );
+    TTQMetaObject *mo = obj->metaObject();
+    TTQStrList propList( mo->propertyNames( true ) );
 
-    for ( TQStrListIterator iter(propList); iter.current(); ++iter ) {
+    for ( TTQStrListIterator iter(propList); iter.current(); ++iter ) {
 
-	TQCString name = iter.current();
+	TTQCString name = iter.current();
 	int propid = mo->findProperty( name.data(), true );
 	if ( propid != -1 ) {
-	    items.append( KJS::String( TQString(name) ) );
+	    items.append( KJS::String( TTQString(name) ) );
 	}
     }
 
@@ -215,7 +215,7 @@ KJS::Value JSObjectProxyImp::call( KJS::ExecState *exec, KJS::Object &self, cons
     switch( id ) {
 	case MethodParent:
 	{
-	    TQObject *po = obj->parent();
+	    TTQObject *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 TQObjectList *kids = obj->children();
+	    const TTQObjectList *kids = obj->children();
 	    return kids ? KJS::Number( kids->count() )	: KJS::Number(0);
 	}
 	break;
@@ -295,16 +295,16 @@ 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;
-    TQMetaObject *mo = obj->metaObject();
-    TQStrList signalList( mo->signalNames( true ) );
+    TTQMetaObject *mo = obj->metaObject();
+    TTQStrList signalList( mo->signalNames( true ) );
 
-    for ( TQStrListIterator iter(signalList); iter.current(); ++iter ) {
+    for ( TTQStrListIterator iter(signalList); iter.current(); ++iter ) {
 
-	TQCString name = iter.current();
-	TQString nm( name );
+	TTQCString name = iter.current();
+	TTQString nm( name );
 
 	int signalid = mo->findSignal( name.data(), true );
-	if ( (signalid != -1) && (mo->signal( signalid, true )->access == QMetaData::Public) )
+	if ( (signalid != -1) && (mo->signal( signalid, true )->access == TQMetaData::Public) )
 	    items.append( KJS::String(nm) );
     }
 
@@ -314,16 +314,16 @@ 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;
-    TQMetaObject *mo = obj->metaObject();
-    TQStrList slotList( mo->slotNames( true ) );
+    TTQMetaObject *mo = obj->metaObject();
+    TTQStrList slotList( mo->slotNames( true ) );
 
-    for ( TQStrListIterator iter(slotList); iter.current(); ++iter ) {
+    for ( TTQStrListIterator iter(slotList); iter.current(); ++iter ) {
 
-	TQCString name = iter.current();
-	TQString nm( name );
+	TTQCString name = iter.current();
+	TTQString nm( name );
 
 	int slotid = mo->findSlot( name.data(), true );
-	if ( (slotid != -1) && (mo->slot( slotid, true )->access == QMetaData::Public) )
+	if ( (slotid != -1) && (mo->slot( slotid, true )->access == TQMetaData::Public) )
 	    items.append( KJS::String(nm) );
     }
 
@@ -341,12 +341,12 @@ KJS::Boolean JSObjectProxyImp::connect( KJS::ExecState *exec,
 
     // Source object and signal
     JSObjectProxy *sendproxy = JSProxy::toObjectProxy( args[0].imp() );
-    TQObject *sender = sendproxy ? sendproxy->object() : 0;
-    TQString sig = args[1].toString(exec).qstring();
+    TTQObject *sender = sendproxy ? sendproxy->object() : 0;
+    TTQString sig = args[1].toString(exec).qstring();
     kdDebug( 80001 ) << "connecting C++ signal" << sig << endl;
     // Receiver and slot/signal
     KJS::Object recvObj;
-    TQString dest;
+    TTQString 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 ) {
-	TQObject *recv = recvproxy ? recvproxy->object() : 0;
+	TTQObject *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( TQObject *sender, const char *sig,
-					const KJS::Object &recv, const TQString &dest )
+KJS::Boolean JSObjectProxyImp::connect( TTQObject *sender, const char *sig,
+					const KJS::Object &recv, const TTQString &dest )
 {
     kdDebug(80001) << "Trying signature '" << sig << "'." << endl;
     // Try to connect to JS method
@@ -409,28 +409,28 @@ KJS::Boolean JSObjectProxyImp::connect( TQObject *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 TQString&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_string(const TTQString&)" );
 	    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 TQColor&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_color(const TTQColor&)" );
 	    break;
 	case JSSlotUtils::SignatureFont:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_font(const TQFont&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_font(const TTQFont&)" );
 	    break;
 	case JSSlotUtils::SignaturePoint:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_point(const TQPoint&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_point(const TTQPoint&)" );
 	    break;
 	case JSSlotUtils::SignatureRect:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_rect(const TQRect&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_rect(const TTQRect&)" );
 	    break;
 	case JSSlotUtils::SignatureSize:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_size(const TQSize&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_size(const TTQSize&)" );
 	    break;
 	case JSSlotUtils::SignaturePixmap:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_pixmap(const TQPixmap&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_pixmap(const TTQPixmap&)" );
 	    break;
 	case JSSlotUtils::SignatureURL:
 	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_url(const KURL&)" );
@@ -446,29 +446,29 @@ KJS::Boolean JSObjectProxyImp::connect( TQObject *sender, const char *sig,
 	    break;
 
 	case JSSlotUtils::SignatureDate:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_date(const TQDate&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_date(const TTQDate&)" );
 	    break;
 	case JSSlotUtils::SignatureTime:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_time(const TQTime&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_time(const TTQTime&)" );
 	    break;
 	case JSSlotUtils::SignatureDateTime:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_datetime(const TQDateTime&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_datetime(const TTQDateTime&)" );
 	    break;
 	case JSSlotUtils::SignatureImage:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_image(const TQImage&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_image(const TTQImage&)" );
 	    break;
-	case JSSlotUtils::SignatureQWidget:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_widget(TQWidget*)" );
+	case JSSlotUtils::SignatureTQWidget:
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_widget(TTQWidget*)" );
 	    break;
 	case JSSlotUtils::SignatureDateDate:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_datedate(const TQDate&, const TQDate& )" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_datedate(const TTQDate&, const TTQDate& )" );
 	    break;
 	case JSSlotUtils::SignatureColorString:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_colorstring(const TQColor&, const TQString&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_colorstring(const TTQColor&, const TTQString&)" );
 	    break;
 	case JSSlotUtils::SignatureCustom:
 	{
-		TQString mangledSig = sig;
+		TTQString 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() );
-    TQObject *sender = sendproxy ? sendproxy->object() : 0;
-    TQString sig = args[1].toString(exec).qstring();
+    TTQObject *sender = sendproxy ? sendproxy->object() : 0;
+    TTQString sig = args[1].toString(exec).qstring();
 
     // Receiver and slot/signal
-    TQObject *recv=0;
-    TQString dest;
+    TTQObject *recv=0;
+    TTQString 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();
 
-    TQObject *parent = obj->parent();
+    TTQObject *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 TQObjectList *kids = obj->children();
+    const TTQObjectList *kids = obj->children();
     if ( !kids )
 	return KJS::Null();
 
-    TQObjectList l( *kids );
-    TQObject *child = 0;
+    TTQObjectList l( *kids );
+    TTQObject *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 {
-	TQString s = args[0].toString( exec ).qstring();
+	TTQString 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();
 
-    TQMetaObject *meta = obj->metaObject();
-    TQString s = args[0].toString(exec).qstring();
+    TTQMetaObject *meta = obj->metaObject();
+    TTQString 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() )
     {
-        TQString msg = i18n( "No property was defined." );
+        TTQString msg = i18n( "No property was defined." );
         return throwError(exec, msg);
     }
 
-    TQMetaObject *meta = obj->metaObject();
-    TQString s = args[0].toString(exec).qstring();
+    TTQMetaObject *meta = obj->metaObject();
+    TTQString s = args[0].toString(exec).qstring();
     kdDebug(80001) << "Get property " << s << " from " << obj->name() << endl;
     if ( meta->findProperty( s.ascii(), true ) == -1 )
     {
-        TQString msg = i18n( "Property '%1' could not be found." ).arg( s );
+        TTQString msg = i18n( "Property '%1' could not be found." ).arg( s );
         return throwError(exec, msg,KJS::ReferenceError);
     }
 
-    TQVariant val = obj->property( s.ascii() );
+    TTQVariant 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);
 
-    TQMetaObject *meta = obj->metaObject();
-    TQString s = args[0].toString(exec).qstring();
+    TTQMetaObject *meta = obj->metaObject();
+    TTQString s = args[0].toString(exec).qstring();
 
     if ( meta->findProperty( s.ascii(), true ) == -1 )
     {
-        TQString msg = i18n( "Property '%1' could not be found." ).arg( s );
+        TTQString 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;
-    TQVariant val = convertToVariant( exec, args[1] );
+    TTQVariant 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 2c1cefb6..5ecb0853 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 TQCString &name, JSObjectProxy *parent );
+		      int id, const TTQCString &name, JSObjectProxy *parent );
     JSObjectProxyImp( KJS::ExecState *exec,
-		      int id, int sigid, const TQCString &name, JSObjectProxy *parent );
+		      int id, int sigid, const TTQCString &name, JSObjectProxy *parent );
     JSObjectProxyImp( KJS::ExecState *exec,
-		      int id, const char *ret, int sig, const TQCString &name, JSObjectProxy *parent );
+		      int id, const char *ret, int sig, const TTQCString &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( TQObject *sender, const char *sig, const KJS::Object &recv, const TQString &dest );
+    KJS::Boolean connect( TTQObject *sender, const char *sig, const KJS::Object &recv, const TTQString &dest );
     /*}*/
 
     virtual bool implementsCall() const { return true; }
@@ -170,12 +170,12 @@ protected:
 
 private:
     int id;
-    TQCString rettype; // return type
+    TTQCString rettype; // return type
     int sigid; // signatureid
     int slotid;
-    TQCString slotname;
+    TTQCString slotname;
     JSObjectProxy *proxy;
-    TQGuardedPtr<TQObject> obj;
+    TTQGuardedPtr<TTQObject> obj;
     class JSObjectProxyImpPrivate *d;
 };
 
diff --git a/kjsembed/jsopaqueproxy.cpp b/kjsembed/jsopaqueproxy.cpp
index 5abd9558..ad38efe1 100644
--- a/kjsembed/jsopaqueproxy.cpp
+++ b/kjsembed/jsopaqueproxy.cpp
@@ -43,13 +43,13 @@ JSOpaqueProxy::JSOpaqueProxy()
 {
 }
 
-JSOpaqueProxy::JSOpaqueProxy( TQTextStream *ts )
+JSOpaqueProxy::JSOpaqueProxy( TTQTextStream *ts )
     : JSProxy( JSProxy::OpaqueProxy ), ptr(0)
 {
     setValue( ts );
 }
 
-JSOpaqueProxy::JSOpaqueProxy( const TQEvent *ev )
+JSOpaqueProxy::JSOpaqueProxy( const TTQEvent *ev )
     : JSProxy( JSProxy::OpaqueProxy ), ptr(0)
 {
     setValue( ev );
@@ -66,7 +66,7 @@ JSOpaqueProxy::~JSOpaqueProxy()
     }
 }
 
-TQString JSOpaqueProxy::typeName() const
+TTQString JSOpaqueProxy::typeName() const
 {
     return ptrtype;
 }
@@ -76,34 +76,34 @@ bool JSOpaqueProxy::inherits( const char *clazz )
     return (ptrtype == clazz);
 }
 
-void JSOpaqueProxy::setValue( TQTextStream *ts )
+void JSOpaqueProxy::setValue( TTQTextStream *ts )
 {
   if( ptr ) {
     if(owner() == JavaScript) ptr->cleanup();
     delete ptr;
   }
-  ptr = new Pointer<TQTextStream>(ts);
-  ptrtype = "TQTextStream";
+  ptr = new Pointer<TTQTextStream>(ts);
+  ptrtype = "TTQTextStream";
 }
 
-void JSOpaqueProxy::setValue( const TQEvent *ev )
+void JSOpaqueProxy::setValue( const TTQEvent *ev )
 {
   if( ptr ) {
     if(owner() == JavaScript) ptr->cleanup();
     delete ptr;
   }
-  ptr = new Pointer<const TQEvent>(ev);
-  ptrtype = "TQEvent";
+  ptr = new Pointer<const TTQEvent>(ev);
+  ptrtype = "TTQEvent";
 }
 
-TQTextStream *JSOpaqueProxy::toTextStream()
+TTQTextStream *JSOpaqueProxy::toTextStream()
 {
-    return toNative<TQTextStream>();
+    return toNative<TTQTextStream>();
 }
 
-const TQEvent *JSOpaqueProxy::toEvent()
+const TTQEvent *JSOpaqueProxy::toEvent()
 {
-    return toNative<TQEvent>();
+    return toNative<TTQEvent>();
 }
 
 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
 {
-    TQString s( "%1 (%2)" );
+    TTQString s( "%1 (%2)" );
     return KJS::UString( s.arg("JSOpaqueProxy").arg(ptrtype) );
 }
 
diff --git a/kjsembed/jsopaqueproxy.h b/kjsembed/jsopaqueproxy.h
index fdad268b..eb446169 100644
--- a/kjsembed/jsopaqueproxy.h
+++ b/kjsembed/jsopaqueproxy.h
@@ -19,8 +19,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef KJSEMBEDJSOPAQUEPROXY_H
-#define KJSEMBEDJSOPAQUEPROXY_H
+#ifndef KJSEMBEDJSOPATQUEPROXY_H
+#define KJSEMBEDJSOPATQUEPROXY_H
 
 #include <tqcstring.h>
 #include <tqevent.h>
@@ -31,7 +31,7 @@
 #include <algorithm>
 #include <typeinfo>
 
-class TQTextStream;
+class TTQTextStream;
 
 namespace KJSEmbed {
 
@@ -57,16 +57,16 @@ public:
     }
 
     /** Creates an opaque proxy. */
-    JSOpaqueProxy( TQTextStream *ts );
+    JSOpaqueProxy( TTQTextStream *ts );
 
     /** Creates an opaque proxy. */
-    JSOpaqueProxy( const TQEvent *ev );
+    JSOpaqueProxy( const TTQEvent *ev );
 
     /** Cleans up. */
     virtual ~JSOpaqueProxy();
 
     /** Returns the type of the wrapped object.*/
-    TQString typeName() const;
+    TTQString typeName() const;
 
     /** Sets the value of the proxy and its type. */
     template<typename T>
@@ -79,11 +79,11 @@ public:
 	  ptrtype = ptype ? ptype : "void";
     }
 
-    /** Sets the value of the proxy to a TQTextStream. */
-    void setValue( TQTextStream *ts );
+    /** Sets the value of the proxy to a TTQTextStream. */
+    void setValue( TTQTextStream *ts );
 
-    /** Sets the value of the proxy to a TQEvent. */
-    void setValue( const TQEvent *ev );
+    /** Sets the value of the proxy to a TTQEvent. */
+    void setValue( const TTQEvent *ev );
 
     /** Returns the proxy value as a pointer. */
     template<typename T>
@@ -98,12 +98,12 @@ public:
     bool inherits( const char *clazz );
 
     /**
-     * Returns the TQTextStream stored in the proxy. If proxy does not contain
-     * a value of type TQTextStream then 0 is returned.
+     * Returns the TTQTextStream stored in the proxy. If proxy does not contain
+     * a value of type TTQTextStream then 0 is returned.
      */
-    TQTextStream *toTextStream();
+    TTQTextStream *toTextStream();
 
-    const TQEvent *toEvent();
+    const TTQEvent *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:
 
-    TQTextStream *textstream;
-    const TQEvent *event;
-    TQCString ptrtype;
+    TTQTextStream *textstream;
+    const TTQEvent *event;
+    TTQCString ptrtype;
 
     class JSOpaqueProxyPrivate *d;
 
@@ -165,7 +165,7 @@ private:
 
 } // namespace KJSEmbed
 
-#endif // KJSEMBEDJSOPAQUEPROXYIMP_H
+#endif // KJSEMBEDJSOPATQUEPROXYIMP_H
 
 // Local Variables:
 // c-basic-offset: 4
diff --git a/kjsembed/jsopaqueproxy_imp.h b/kjsembed/jsopaqueproxy_imp.h
index 5518385d..7d2d5157 100644
--- a/kjsembed/jsopaqueproxy_imp.h
+++ b/kjsembed/jsopaqueproxy_imp.h
@@ -19,8 +19,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef KJSEMBEDJSOPAQUEPROXYIMP_H
-#define KJSEMBEDJSOPAQUEPROXYIMP_H
+#ifndef KJSEMBEDJSOPATQUEPROXYIMP_H
+#define KJSEMBEDJSOPATQUEPROXYIMP_H
 
 #include <tqcstring.h>
 #include <kjs/object.h>
@@ -59,7 +59,7 @@ private:
 } // namespace KJSEmbed::Bindings
 } // namespace KJSEmbed
 
-#endif // KJSEMBEDJSOPAQUEPROXYIMP_H
+#endif // KJSEMBEDJSOPATQUEPROXYIMP_H
 
 // Local Variables:
 // c-basic-offset: 4
diff --git a/kjsembed/jsproxy.cpp b/kjsembed/jsproxy.cpp
index cbf3a5e3..011ef6f2 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 TQString & classname )
+bool JSProxy::checkType( const KJS::Object &object, ProxyType prxyType, const TTQString & classname )
 {
     JSProxy *prxy = toProxy(object.imp());
     if( !prxy )
diff --git a/kjsembed/jsproxy.h b/kjsembed/jsproxy.h
index db22acf6..048b3374 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 TQString &classname);
+    static bool checkType( const KJS::Object &object, ProxyType prxyType, const TTQString &classname);
 
     
     JSProxy( int type );
     virtual ~JSProxy();
 
     /** Returns the string value of the class name **/
-    virtual TQString typeName() const = 0;
+    virtual TTQString 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 872fb00f..bd0ba636 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 TQObject *obj ) const
+bool JSSecurityPolicy::isObjectAllowed( const JSObjectProxy *prx, const TTQObject *obj ) const
 {
     if ( !obj )
 	return false;
@@ -83,13 +83,13 @@ bool JSSecurityPolicy::isObjectAllowed( const JSObjectProxy *prx, const TQObject
 }
 
 bool JSSecurityPolicy::isPropertyAllowed( const JSObjectProxy *prx,
-				const TQObject *obj, const char * /*prop*/ ) const
+				const TTQObject *obj, const char * /*prop*/ ) const
 {
     return hasCapability( CapabilityGetProperties|CapabilitySetProperties ) && isObjectAllowed( prx, obj );
 }
 
-bool JSSecurityPolicy::isCreateAllowed( const JSObjectProxy *prx, const TQObject *parent,
-				      const TQString &/*clazz*/, const TQString &/*name*/ ) const
+bool JSSecurityPolicy::isCreateAllowed( const JSObjectProxy *prx, const TTQObject *parent,
+				      const TTQString &/*clazz*/, const TTQString &/*name*/ ) const
 {
     if ( hasCapability(CapabilityFactory) && isObjectAllowed( prx, parent ) )
 	return true;
diff --git a/kjsembed/jssecuritypolicy.h b/kjsembed/jssecuritypolicy.h
index 26e55881..df39117e 100644
--- a/kjsembed/jssecuritypolicy.h
+++ b/kjsembed/jssecuritypolicy.h
@@ -36,7 +36,7 @@ class JSObjectProxy;
  * A SecurityPolicy must define tests for the following situations:
  * <ul>
  * <li>Does this request come from the correct @ref KJS::Interpreter ?
- * <li>Is the script allowed to access the specified TQObject ?
+ * <li>Is the script allowed to access the specified TTQObject ?
  * <li>Is the script allowed to access the specified property ?
  * </ul>
  * The various isAllowed() methods are called automatically by @ref JSObjectProxy
@@ -47,7 +47,7 @@ class JSObjectProxy;
  * <ul>
  * <li>Only the interpreter specified when the initial binding was
  * defined may access the proxy.
- * <li>Scripts may only access QObjects that are children of the root
+ * <li>Scripts may only access TQObjects that are children of the root
  * object. The root object is specified when the embedding application
  * creates the initial binding, and is automatically inherited by any
  * sub-proxies that may be created by the script.
@@ -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 TQObject.
+     * Returns true if scripts are allowed to see the specified TTQObject.
      */
-    virtual bool isObjectAllowed( const JSObjectProxy *prx, const TQObject *obj ) const;
+    virtual bool isObjectAllowed( const JSObjectProxy *prx, const TTQObject *obj ) const;
 
     /**
      * Returns true if scripts are allowed to see the specified property.
      */
-    virtual bool isPropertyAllowed( const JSObjectProxy *prx, const TQObject *obj, const char *prop ) const;
+    virtual bool isPropertyAllowed( const JSObjectProxy *prx, const TTQObject *obj, const char *prop ) const;
 
     /**
      * Returns true if scripts are allowed to create the specified child object.
      */
-    virtual bool isCreateAllowed( const JSObjectProxy *prx, const TQObject *parent,
-				  const TQString &clazz, const TQString &name ) const;
+    virtual bool isCreateAllowed( const JSObjectProxy *prx, const TTQObject *parent,
+				  const TTQString &clazz, const TTQString &name ) const;
 
     /**
      * Returns the default SecurityPolicy.
diff --git a/kjsembed/jsvalueproxy.cpp b/kjsembed/jsvalueproxy.cpp
index cbc75b34..a7af8247 100644
--- a/kjsembed/jsvalueproxy.cpp
+++ b/kjsembed/jsvalueproxy.cpp
@@ -44,18 +44,18 @@ JSValueProxy::~JSValueProxy()
 {
 }
 
-TQString JSValueProxy::typeName() const
+TTQString JSValueProxy::typeName() const
 {
     return val.typeName();
 }
 
-void JSValueProxy::setValue( const TQVariant &var )
+void JSValueProxy::setValue( const TTQVariant &var )
 {
     kdDebug(80001) << "JSValueProxy::setValue() variant, type is " << var.typeName() << endl;
     val = var;
 }
 
-TQVariant JSValueProxy::toVariant() const 
+TTQVariant 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
 {
-    TQString s( "%1 (%2)" );
+    TTQString s( "%1 (%2)" );
     return KJS::UString( s.arg("JSValueProxy").arg(val.typeName()) );
 }
 
diff --git a/kjsembed/jsvalueproxy.h b/kjsembed/jsvalueproxy.h
index 4500fe02..ec100950 100644
--- a/kjsembed/jsvalueproxy.h
+++ b/kjsembed/jsvalueproxy.h
@@ -40,13 +40,13 @@ public:
     JSValueProxy();
     virtual ~JSValueProxy();
 
-    TQString typeName() const;
+    TTQString typeName() const;
     /** Returns true iff the content of this proxy inherits the specified base-class. */
     bool inherits( const char *clazz );
 
-    void setValue( const TQVariant &var );
+    void setValue( const TTQVariant &var );
 
-    TQVariant toVariant() const;
+    TTQVariant 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:
-    TQVariant val;
+    TTQVariant val;
     class JSValueProxyPrivate *d;
 };
 
diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp
index 4b6604cf..762d8715 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;
-    TQCString appName = "kjscmd";
+    TTQCString appName = "kjscmd";
 
     // Set the name of the instance
     for ( int i = 1 ; i < argc ; i++ ) {
-        TQCString arg( argv[i] );
+        TTQCString 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) {
-	    TQTextStream err( stderr, IO_WriteOnly );
-	    TQTextStream out( stdout, IO_WriteOnly );
+	    TTQTextStream err( stderr, IO_WriteOnly );
+	    TTQTextStream 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);
-        TQString type = exception.get(exec,KJS::Identifier("name")).toString(exec).qstring();
-        TQString message = exception.get(exec,KJS::Identifier("message")).toString(exec).qstring();
+        TTQString type = exception.get(exec,KJS::Identifier("name")).toString(exec).qstring();
+        TTQString 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( TQString("include('cmdline.js');") );
+	part->execute( TTQString("include('cmdline.js');") );
     }
 
     return result;
diff --git a/kjsembed/kjsembed/kjsembed.pro b/kjsembed/kjsembed/kjsembed.pro
index 0f9c2955..76d28dc2 100755
--- a/kjsembed/kjsembed/kjsembed.pro
+++ b/kjsembed/kjsembed/kjsembed.pro
@@ -9,7 +9,7 @@ LIBS += -L../kjs -lkjs \
         -L../builtins -lbuiltins \
         -L../qtbindings -lqtbindings \
 	-L../bindings -lbindings \
-        -lqui
+        -ltqui
 
 win32:LIBS += -L../pcre -lpcre
 unix:LIBS += -lpcreposix -lpcre
diff --git a/kjsembed/kjsembedpart.cpp b/kjsembed/kjsembedpart.cpp
index b39b8813..9e47bc3b 100644
--- a/kjsembed/kjsembedpart.cpp
+++ b/kjsembed/kjsembedpart.cpp
@@ -89,7 +89,7 @@ namespace KJSEmbed {
 // KPart
 //
 
-KJSEmbedPart::KJSEmbedPart( TQObject *parent, const char *name )
+KJSEmbedPart::KJSEmbedPart( TTQObject *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( TQObject *parent, const char *name )
     createActionClient();
 }
 
-KJSEmbedPart::KJSEmbedPart( TQWidget *wparent, const char *wname, TQObject *parent, const char *name )
+KJSEmbedPart::KJSEmbedPart( TTQWidget *wparent, const char *wname, TTQObject *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( TQWidget *wparent, const char *wname, TQObject *pare
     createActionClient();
 }
 
-KJSEmbedPart::KJSEmbedPart( KJS::Interpreter *jsi, TQWidget *wparent, const char *wname,
-			    TQObject *parent, const char *name )
+KJSEmbedPart::KJSEmbedPart( KJS::Interpreter *jsi, TTQWidget *wparent, const char *wname,
+			    TTQObject *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 ) {
-	TQCString name = widgetname ? widgetname : TQCString("jsembed_console");
+	TTQCString name = widgetname ? widgetname : TTQCString("jsembed_console");
 	jsConsole = new JSConsoleWidget( this, widgetparent, name );
 	setWidget( jsConsole );
 	jsfactory->addType( jsConsole->className() );
@@ -171,9 +171,9 @@ JSConsoleWidget *KJSEmbedPart::view()
 return 0L;
 }
 
-TQStringList KJSEmbedPart::constructorNames() const
+TTQStringList KJSEmbedPart::constructorNames() const
 {
-    TQStringList classes;
+    TTQStringList classes;
 
     KJS::List cons = constructorList();
     KJS::ListIterator it = cons.begin();
@@ -224,9 +224,9 @@ KJS::List KJSEmbedPart::constructorList() const
 // Version information
 //
 
-TQCString KJSEmbedPart::versionString() const
+TTQCString KJSEmbedPart::versionString() const
 {
-    return TQCString(KJSEMBED_VERSION_STRING);
+    return TTQCString(KJSEMBED_VERSION_STRING);
 }
 
 int KJSEmbedPart::versionMajor() const
@@ -243,7 +243,7 @@ int KJSEmbedPart::versionMinor() const
 // Execute a JS script.
 //
 
-KJS::Value KJSEmbedPart::evaluate( const TQString &script, const KJS::Value &self )
+KJS::Value KJSEmbedPart::evaluate( const TTQString &script, const KJS::Value &self )
 {
     if ( execute( res, script, self ) )
 	return res.value();
@@ -251,12 +251,12 @@ KJS::Value KJSEmbedPart::evaluate( const TQString &script, const KJS::Value &sel
     return KJS::Null();
 }
 
-bool KJSEmbedPart::execute( const TQString &script, const KJS::Value &self )
+bool KJSEmbedPart::execute( const TTQString &script, const KJS::Value &self )
 {
     return execute( res, script, self );
 }
 
-bool KJSEmbedPart::execute( KJS::Completion &result, const TQString &script, const KJS::Value &self )
+bool KJSEmbedPart::execute( KJS::Completion &result, const TTQString &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
-	TQString cmd = url.url();
+	TTQString cmd = url.url();
 #else
-	TQString cmd = url.toString();
+	TTQString cmd = url.toString();
 #endif
 
-	TQString js( "javascript:" );
-	cmd = cmd.replace( 0, js.length(), TQString("") );
+	TTQString js( "javascript:" );
+	cmd = cmd.replace( 0, js.length(), TTQString("") );
 
 //	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 TQString &name, const KJS::Value &self )
+bool KJSEmbedPart::runFile( const TTQString &name, const KJS::Value &self )
 {
     kdDebug(80001) << "KJSEmbedPart::runFile(): file is '" << name << "'" << endl;
-    TQString script = loadFile( name );
+    TTQString script = loadFile( name );
     return execute( script, self );
 }
 
-bool KJSEmbedPart::loadActionSet( const TQString &file )
+bool KJSEmbedPart::loadActionSet( const TTQString &file )
 {
 #ifndef QT_ONLY
     return xmlclient->load( file );
@@ -304,23 +304,23 @@ bool KJSEmbedPart::loadActionSet( const TQString &file )
 #endif // QT_ONLY
 }
 
-TQString KJSEmbedPart::loadFile( const TQString &src )
+TTQString KJSEmbedPart::loadFile( const TTQString &src )
 {
-    TQString script;
+    TTQString script;
 
     if ( src == "-" ) {
-	TQTextStream ts( stdin, IO_ReadOnly );
+	TTQTextStream ts( stdin, IO_ReadOnly );
 	script = ts.read();
     }
     else {
-	TQFile file( src );
+	TTQFile file( src );
 	if ( file.open( IO_ReadOnly ) ) {
-	    script = TQString( file.readAll() );
+	    script = TTQString( file.readAll() );
 	}
 	else {
 	    kdWarning() << "Could not open file '" << src << "', "
 			<< strerror( errno ) << endl;
-	    return TQString::null;
+	    return TTQString::null;
 	}
     }
 
@@ -337,14 +337,14 @@ TQString KJSEmbedPart::loadFile( const TQString &src )
 // Publishing objects.
 //
 
-KJS::Object KJSEmbedPart::bind( TQObject *obj )
+KJS::Object KJSEmbedPart::bind( TTQObject *obj )
 {
     KJS::Object jsobj = jsfactory->createProxy( js->globalExec(), obj );
     JSProxy::toObjectProxy(jsobj.imp() )->setOwner(JSProxy::Native);
     return jsobj;
 }
 
-KJS::Object KJSEmbedPart::addObject( TQObject *obj, KJS::Object &parent, const char *name )
+KJS::Object KJSEmbedPart::addObject( TTQObject *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( TQObject *obj, KJS::Object &parent, const c
     return jsobj;
 }
 
-KJS::Object KJSEmbedPart::addObject( TQObject *obj, const char *name )
+KJS::Object KJSEmbedPart::addObject( TTQObject *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 TQString &objectString )
+static KJS::Object scopeWalker( KJS::ExecState *exec, const KJS::Object &root, const TTQString &objectString )
 {
   KJS::Object returnObject = root;
-  TQStringList objects = TQStringList::split(".", objectString);
+  TTQStringList objects = TTQStringList::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 TQString & methodName, const KJS::List & args ) const
+KJS::Value KJSEmbedPart::callMethod( const TTQString & 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 TQString & methodName, const KJS::Lis
   return retValue;
 }
 
-KJS::Value KJSEmbedPart::getValue( const TQString & valueName ) const
+KJS::Value KJSEmbedPart::getValue( const TTQString & 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 TQString & valueName ) const
   return obj.get(exec, id );
 }
 
-void KJSEmbedPart::putValue( const TQString & valueName, const KJS::Value & value )
+void KJSEmbedPart::putValue( const TTQString & 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 TQString & valueName, const KJS::Value & valu
   obj.put(exec, id, value);
 }
 
-void KJSEmbedPart::putVariant( const TQString & valueName, const TQVariant & value )
+void KJSEmbedPart::putVariant( const TTQString & valueName, const TTQVariant & value )
 {
 	KJS::Value val = convertToValue( js->globalExec(), value);
 	putValue( valueName, val );
 }
 
-TQVariant KJSEmbedPart::getVariant( const TQString & valueName ) const
+TTQVariant KJSEmbedPart::getVariant( const TTQString & valueName ) const
 {
 	return convertToVariant( js->globalExec(), getValue( valueName ) );
 } 
 
-bool KJSEmbedPart::hasMethod( const TQString & methodName )
+bool KJSEmbedPart::hasMethod( const TTQString & 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 0d87bb00..6435d526 100644
--- a/kjsembed/kjsembedpart.h
+++ b/kjsembed/kjsembedpart.h
@@ -40,7 +40,7 @@
 #include <kjsembed/qtstubs.h>
 #endif
 
-class TQWidget;
+class TTQWidget;
 
 #define KJSEMBED_VERSION_STRING "0.3"
 #define KJSEMBED_VERSION_MAJOR 0
@@ -63,44 +63,44 @@ 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
- * QObect 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 QMaps and QValueLists
- * 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
+ * TQObect based classes with a few simple methods.  The interface also allows for the manipulation of TTQVariant 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
  * that will be your interface between C++ and Javascript.  This object than can expose C++ methods via Qt slots, and
- * TQVariant datatypes via Qt properties.  This class will also have an interface where C++ objects can call Javascript
+ * TTQVariant 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( TQStringList constructorNames READ constructorNames )
-    Q_PROPERTY( TQCString versionString READ versionString )
+    Q_PROPERTY( TTQStringList constructorNames READ constructorNames )
+    Q_PROPERTY( TTQCString versionString READ versionString )
     Q_PROPERTY( int versionMajor READ versionMajor )
     Q_PROPERTY( int versionMinor READ versionMinor )
 
 public:
     /** Create a KJSEmbedPart. */
-    KJSEmbedPart( TQObject *parent=0, const char *name=0 );
+    KJSEmbedPart( TTQObject *parent=0, const char *name=0 );
 
     /**
      * Creates a KJSEmbedPart for which the parents of the view and part are different.
      *
      * Caution! you cannot use parent = [KQ]Application and wparent = 0L.
      * This will cause a crash on exit since the widget will not be destroyed
-     * but the part will get destroyed at the end of the QApplication
+     * but the part will get destroyed at the end of the TQApplication
      * constructor.  This results in the widget trying to do GUI related things
-     * after the QPaint stuff is destroyed.
+     * after the TQPaint stuff is destroyed.
      */
-    KJSEmbedPart( TQWidget *wparent, const char *wname=0, TQObject *parent=0, const char *name=0 );
+    KJSEmbedPart( TTQWidget *wparent, const char *wname=0, TTQObject *parent=0, const char *name=0 );
 
     /**
      * Create a KJSEmbedPart with the specified interpreter.
      *
      * See warning above.
      */
-    KJSEmbedPart( KJS::Interpreter *js, TQWidget *wparent, const char *wname=0,
-		  TQObject *parent=0, const char *name=0 );
+    KJSEmbedPart( KJS::Interpreter *js, TTQWidget *wparent, const char *wname=0,
+		  TTQObject *parent=0, const char *name=0 );
 
     /** Cleans up. */
     virtual ~KJSEmbedPart();
@@ -110,7 +110,7 @@ public:
     //
 
     /** Returns the version of KJSEmbed. */
-    TQCString versionString() const;
+    TTQCString versionString() const;
 
     /** Returns the minor version number of KJSEmbed. */
     int versionMajor() const;
@@ -129,53 +129,53 @@ public:
     * else
     *   ... // function not present.
     */
-    bool hasMethod( const TQString &methodName );
+    bool hasMethod( const TTQString &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(), TQColor("blue" ) ) );
+    * args.append(KJSEmbed::convertToValue(js->globalExec(), TTQColor("blue" ) ) );
     * KJS::Value val = js->callMethod("javascriptFunction", args );
-    * TQString myString = val.toString().qstring();
+    * TTQString myString = val.toString().qstring();
     * @endcode
     */
 
-    KJS::Value callMethod(const TQString &methodName, const KJS::List &args) const;
+    KJS::Value callMethod(const TTQString &methodName, const KJS::List &args) const;
     /** Gets a value from Javascript starting from the global context.
     * @code
     * KJS::Value val = js->getValue("someValue");
-    * TQString myString = val.toString().qstring();
+    * TTQString myString = val.toString().qstring();
     * @endcode
     */
-    KJS::Value getValue( const TQString &valueName ) const;
+    KJS::Value getValue( const TTQString &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(), TQColor("blue"));
+    * KJS::Value val = KJSEmbed::convertToValue(js->globalExec(), TTQColor("blue"));
     * js->putValue("myVar", val);
     * @endcode
     */
-    void putValue( const TQString &valueName, const KJS::Value &value);
+    void putValue( const TTQString &valueName, const KJS::Value &value);
 
     /** Convinence method that wraps around @ref putValue that only handles values
-    * that are supported by TQVariant.
+    * that are supported by TTQVariant.
     * @code
-    * js->putVariant( "myVar", TQColor("blue") );
+    * js->putVariant( "myVar", TTQColor("blue") );
     * @endcode
     */
-    void putVariant( const TQString &valueName, const TQVariant &value);
+    void putVariant( const TTQString &valueName, const TTQVariant &value);
 
     /** Convinence method that wraps around @ref getValue that only handles values
-    * that are supported by TQVariant.
+    * that are supported by TTQVariant.
     * @code
-    * TQColor value = js->getVariant( "myVar").toColor();
+    * TTQColor value = js->getVariant( "myVar").toColor();
     * @endcode
     */
-    TQVariant getVariant( const TQString &valueName ) const;
+    TTQVariant getVariant( const TTQString &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++
-     * TQObject *myClass = new QObjectBasedClass(this, "jsObject");
+     * TTQObject *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( TQObject *obj, const char *name=0 );
+    KJS::Object addObject( TTQObject *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( TQObject *obj, KJS::Object &parent, const char *name=0 );
+    KJS::Object addObject( TTQObject *obj, KJS::Object &parent, const char *name=0 );
 
-    /** Returns a JS::Object that provides a binding to the specified TQObject. */
-    KJS::Object bind( TQObject *obj );
+    /** Returns a JS::Object that provides a binding to the specified TTQObject. */
+    KJS::Object bind( TTQObject *obj );
 
     //
     // Query the supported types
     //
 
     /** Returns a list of the names of the constructors of this interpreter. */
-    TQStringList constructorNames() const;
+    TTQStringList constructorNames() const;
 
     /** Returns a JS Array of the constructors of this interpreter. */
     KJS::Value constructors() const;
@@ -228,7 +228,7 @@ public slots:
     // Reimplement the KPart API.
     //
 
-    /** Returns the view widget, creating one if required.*/
+    /** Returns the view widget, creating one if retquired.*/
     virtual KJSEmbed::JSConsoleWidget *view();
 
     /** Opens a URL. If the URL has the protocol 'javascript' then it is executed. */
@@ -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 TQString &file );
+    bool loadActionSet( const TTQString &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 TQString &script, const KJS::Value &self=KJS::Null() );
+    virtual KJS::Value evaluate( const TTQString &script, const KJS::Value &self=KJS::Null() );
 
     /** Executes the specified string, with the specified value as 'this'. */
-    bool execute( const TQString &script, const KJS::Value &self=KJS::Null() );
+    bool execute( const TTQString &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 TQString &script, const KJS::Value &self );
+    virtual bool execute( KJS::Completion &result, const TTQString &script, const KJS::Value &self );
 
     /** Loads and runs the specified file. */
-    virtual bool runFile( const TQString &filename, const KJS::Value &self=KJS::Null() );
+    virtual bool runFile( const TTQString &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.
      */
-    TQString loadFile( const TQString &file );
+    TTQString loadFile( const TTQString &file );
 
 protected:
     /** Creates the interpreter. */
@@ -306,8 +306,8 @@ private:
     JSConsoleWidget *jsConsole;
     JSFactory *jsfactory;
     JSBuiltIn *builtins;
-    TQWidget *widgetparent;
-    TQCString widgetname;
+    TTQWidget *widgetparent;
+    TTQCString widgetname;
 
     KJS::Object partobj;
     KJS::Completion res;
diff --git a/kjsembed/kjsembedpart_imp.cpp b/kjsembed/kjsembedpart_imp.cpp
index abd28782..599a3f04 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 TQString &p )
+KJSEmbedPartImp::KJSEmbedPartImp( KJS::ExecState *exec, KJSEmbedPart *jsp, int mid, const TTQString &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 )
 {
-    TQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TQString::null;
-//    TQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TTQString::null;
+//    TTQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TTQString::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;
     }
 
-    TQString msg = i18n( "KJSEmbedPartImp has no method with id '%1'." ).arg( id );
+    TTQString 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 ae743fed..a38b286f 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 TQString &param=TQString::null );
+    KJSEmbedPartImp( KJS::ExecState *exec, KJSEmbedPart *part, int id, const TTQString &param=TTQString::null );
     ~KJSEmbedPartImp();
 
-    TQString parameter() const { return param; }
+    TTQString 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;
-    TQString param;
+    TTQString param;
     class KJSEmbedPartImpPrivate *d;
 };
 
diff --git a/kjsembed/kscript/javascript.cpp b/kjsembed/kscript/javascript.cpp
index 22de1aef..51cc6b4d 100644
--- a/kjsembed/kscript/javascript.cpp
+++ b/kjsembed/kscript/javascript.cpp
@@ -31,7 +31,7 @@
 typedef KGenericFactory<JavaScript, KScriptClientInterface> JavaScriptFactory;
 K_EXPORT_COMPONENT_FACTORY( libjavascript, JavaScriptFactory( "JavaScript" ) )
 
-JavaScript::JavaScript(KScriptClientInterface *parent, const char *name, const TQStringList &args )
+JavaScript::JavaScript(KScriptClientInterface *parent, const char *name, const TTQStringList &args )
 {
 	ScriptClientInterface = parent;
 	m_jsembed = new KJSEmbed::KJSEmbedPart(this, "kjsembed_part");
@@ -45,25 +45,25 @@ JavaScript::~JavaScript()
 {
 }
 
-TQString JavaScript::script() const
+TTQString JavaScript::script() const
 {
 	return m_scriptLoc;
 }
 
-void JavaScript::setScript( const TQString &scriptFile  )
+void JavaScript::setScript( const TTQString &scriptFile  )
 {
 	m_scriptLoc = scriptFile;
 }
 
-void JavaScript::setScript( const TQString &scriptFile, const TQString &method )
+void JavaScript::setScript( const TTQString &scriptFile, const TTQString &method )
 {
 	m_scriptLoc = scriptFile;
 	m_method = method;
 }
 
-void JavaScript::run(TQObject *context, const TQVariant &arg)
+void JavaScript::run(TTQObject *context, const TTQVariant &arg)
 {
-	TQVariant retVal;
+	TTQVariant retVal;
 	if( context ) m_jsembed->addObject(context);
 
 	m_jsembed->runFile(m_scriptLoc, m_jsembed->globalObject() );
@@ -78,17 +78,17 @@ void JavaScript::run(TQObject *context, const TQVariant &arg)
 	ScriptClientInterface->done(KScriptClientInterface::ResultSuccess, retVal);
 }
 
-void JavaScript::writeLine( const TQString &msg )
+void JavaScript::writeLine( const TTQString &msg )
 {
 	ScriptClientInterface->output(msg);
 }
 
-void JavaScript::writeWarning( const TQString &msg )
+void JavaScript::writeWarning( const TTQString &msg )
 {
 	ScriptClientInterface->warning(msg);
 }
 
-void JavaScript::writeError( const TQString &msg )
+void JavaScript::writeError( const TTQString &msg )
 {
 	ScriptClientInterface->error(msg);
 }
@@ -98,7 +98,7 @@ void JavaScript::setProgress( int percent )
 	ScriptClientInterface->progress(percent);
 }
 
-TQString JavaScript::appID() const
+TTQString JavaScript::appID() const
 {
 	return kapp->dcopClient()->appId();
 }
diff --git a/kjsembed/kscript/javascript.h b/kjsembed/kscript/javascript.h
index fa76a341..2fb07509 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( TQString appID READ appID )
+	Q_PROPERTY( TTQString appID READ appID )
 
 public:
-	JavaScript(KScriptClientInterface *parent, const char *name, const TQStringList &args);
+	JavaScript(KScriptClientInterface *parent, const char *name, const TTQStringList &args);
 	virtual ~JavaScript();
-	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);
+	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);
 	void kill();
 
-	TQString appID() const;
+	TTQString appID() const;
 
 public slots:
-	void writeLine( const TQString &msg );
-	void writeWarning( const TQString &msg );
-	void writeError( const TQString &msg );
+	void writeLine( const TTQString &msg );
+	void writeWarning( const TTQString &msg );
+	void writeError( const TTQString &msg );
 	void setProgress( int percent );
 
 private:
 	KScriptClientInterface *ScriptClientInterface;
 	KJSEmbed::KJSEmbedPart *m_jsembed;
-	TQString m_method;
-	TQString m_scriptLoc;
+	TTQString m_method;
+	TTQString m_scriptLoc;
 };
 
 #endif
diff --git a/kjsembed/kscript/swaptabs.js b/kjsembed/kscript/swaptabs.js
index 6adbc2c3..20d19248 100644
--- a/kjsembed/kscript/swaptabs.js
+++ b/kjsembed/kscript/swaptabs.js
@@ -36,7 +36,7 @@ if( dlg.exec() == 1 )
 			var startCol = client.call(appID, "SelectionInterfaceExt#" + documentIndex, "selStartCol()");
 			client.call(appID, "SelectionInterface#" + documentIndex, "removeSelectedText()");
 			client.call(appID, "SelectionInterface#" + documentIndex, "clearSelection()");
-			client.call(appID, "EditInterface#" + documentIndex, "insertText(uint,uint,QString)", startLine, startCol, destText);
+			client.call(appID, "EditInterface#" + documentIndex, "insertText(uint,uint,TQString)", startLine, startCol, destText);
 		}
 		else
 		{
@@ -45,7 +45,7 @@ if( dlg.exec() == 1 )
 		}
 	}
 	else
-		client.call(appID, "EditInterface#" + documentIndex, "setText(QString)", destText );
+		client.call(appID, "EditInterface#" + documentIndex, "setText(TQString)", destText );
 
 	// save prefs
 	config.writeNumEntry("Spaces", dlg.count.value );
diff --git a/kjsembed/kscript/swaptabs.ui b/kjsembed/kscript/swaptabs.ui
index 8cb243f8..f7f5e973 100644
--- a/kjsembed/kscript/swaptabs.ui
+++ b/kjsembed/kscript/swaptabs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MyDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>MyDialog</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout2</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -38,7 +38,7 @@
                         <string>Number of spaces for a tab:</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox">
+                <widget class="TQSpinBox">
                     <property name="name">
                         <cstring>count</cstring>
                     </property>
@@ -48,7 +48,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>swap</cstring>
             </property>
@@ -62,7 +62,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioButton1</cstring>
                     </property>
@@ -70,7 +70,7 @@
                         <string>Tabs for spaces</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioButton2</cstring>
                     </property>
@@ -80,7 +80,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>selection</cstring>
             </property>
@@ -88,7 +88,7 @@
                 <string>Substitute only in current selection</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -119,7 +119,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -136,7 +136,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
diff --git a/kjsembed/ksimpleprocess.cpp b/kjsembed/ksimpleprocess.cpp
index 212566ec..720bfa42 100644
--- a/kjsembed/ksimpleprocess.cpp
+++ b/kjsembed/ksimpleprocess.cpp
@@ -21,19 +21,19 @@
 #include "ksimpleprocess.h"
 #include <tqapplication.h>
 #include <klocale.h>
-static TQStringList  splitArgList( const TQString &args)
+static TTQStringList  splitArgList( const TTQString &args)
 {
-	TQStringList returnArgs = TQStringList::split( ' ', args);
+	TTQStringList returnArgs = TTQStringList::split( ' ', args);
 	return returnArgs;
 }
 
-TQString KSimpleProcess::exec( const TQString &args, bool addStdErr )
+TTQString KSimpleProcess::exec( const TTQString &args, bool addStdErr )
 {
 	KSimpleProcess proc;
 	return proc.execInternal( args, addStdErr);
 }
 
-TQString KSimpleProcess::execInternal( const TQString &args, bool addStdError)
+TTQString KSimpleProcess::execInternal( const TTQString &args, bool addStdError)
 {
 	m_proc->setArguments( splitArgList( args ));
 	connect(m_proc, TQT_SIGNAL(processExited()), this, TQT_SLOT(slotProcessExited()));
@@ -47,11 +47,11 @@ TQString KSimpleProcess::execInternal( const TQString &args, bool addStdError)
 	return m_currBuffer;
 }
 
-KSimpleProcess::KSimpleProcess() : TQObject(0,0)
+KSimpleProcess::KSimpleProcess() : TTQObject(0,0)
 {
 	m_currBuffer = "";
 	m_stdErrOn = false;
-	m_proc = new TQProcess(this);
+	m_proc = new TTQProcess(this);
 }
 
 KSimpleProcess::~KSimpleProcess()
@@ -61,13 +61,13 @@ KSimpleProcess::~KSimpleProcess()
 
 
 // If a troll sees this, he kills david not me
-void qt_enter_modal( TQWidget *widget );
-void qt_leave_modal( TQWidget *widget );
+void qt_enter_modal( TTQWidget *widget );
+void qt_leave_modal( TTQWidget *widget );
 
 void KSimpleProcess::enter_loop()
 {
-  TQWidget dummy(0,0,WType_Dialog | WShowModal);
-  dummy.setFocusPolicy( TQWidget::NoFocus );
+  TTQWidget dummy(0,0,WType_Dialog | WShowModal);
+  dummy.setFocusPolicy( TTQWidget::NoFocus );
   qt_enter_modal(&dummy);
   qApp->enter_loop();
   qt_leave_modal(&dummy);
diff --git a/kjsembed/ksimpleprocess.h b/kjsembed/ksimpleprocess.h
index cc825f05..0fd5745d 100644
--- a/kjsembed/ksimpleprocess.h
+++ b/kjsembed/ksimpleprocess.h
@@ -31,7 +31,7 @@
  *
  * @author Ian Reinhart Geiser, geiseri@kde.org
  */
-class KSimpleProcess : public QObject
+class KSimpleProcess : public TQObject
 {
     Q_OBJECT
 
@@ -43,21 +43,21 @@ public:
      * in value.
      * Example:
      *\code
-     * TQString myProc = KSimpleProcess::exec( "ps -uh" );
+     * TTQString myProc = KSimpleProcess::exec( "ps -uh" );
      * kdDebug() << "Running Processes\n" << myProc << endl;
      *\endcode
      */
-    static TQString exec( const TQString &args, bool addStdErr = false );
+    static TTQString exec( const TTQString &args, bool addStdErr = false );
 
 private:
     KSimpleProcess();
     ~KSimpleProcess();
     void enter_loop();
-    TQString execInternal( const TQString &args, bool addStdError);
+    TTQString execInternal( const TTQString &args, bool addStdError);
     
-    TQString m_currBuffer;
+    TTQString m_currBuffer;
     bool m_stdErrOn;
-    TQProcess *m_proc;
+    TTQProcess *m_proc;
 
 public slots:
     void slotProcessExited();
diff --git a/kjsembed/lgpl.txt b/kjsembed/lgpl.txt
index ec47efc0..0f25e317 100644
--- a/kjsembed/lgpl.txt
+++ b/kjsembed/lgpl.txt
@@ -182,12 +182,12 @@ above, provided that you also meet all of these conditions:
 
     (For example, a function in a library to compute square roots has
     a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
+    application.  Therefore, Subsection 2d retquires that any
     application-supplied function or table used by this function must
     be optional: if the application does not supply it, the square
     root function must still compute square roots.)
 
-These requirements apply to the modified work as a whole.  If
+These retquirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Library,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
@@ -233,7 +233,7 @@ medium customarily used for software interchange.
 
   If distribution of object code is made by offering access to copy
 from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
+source code from the same place satisfies the retquirement to
 distribute the source code, even though third parties are not
 compelled to copy the source along with the object code.
 
@@ -315,7 +315,7 @@ of these things:
     e) Verify that the user has already received a copy of these
     materials or that you have already sent this user a copy.
 
-  For an executable, the required form of the "work that uses the
+  For an executable, the retquired form of the "work that uses the
 Library" must include any data and utility programs needed for
 reproducing the executable from it.  However, as a special exception,
 the materials to be distributed need not include anything that is
@@ -324,7 +324,7 @@ components (compiler, kernel, and so on) of the operating system on
 which the executable runs, unless that component itself accompanies
 the executable.
 
-  It may happen that this requirement contradicts the license
+  It may happen that this retquirement contradicts the license
 restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
@@ -354,7 +354,7 @@ rights under this License.  However, parties who have received copies,
 or rights, from you under this License will not have their licenses
 terminated so long as such parties remain in full compliance.
 
-  9. You are not required to accept this License, since you have not
+  9. You are not retquired to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Library or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
@@ -440,15 +440,15 @@ EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
 OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
 KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+PURPOSE.  THE ENTIRE RISK AS TO THE TQUALITY AND PERFORMANCE OF THE
 LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
 THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+  16. IN NO EVENT UNLESS RETQUIRED BY APPLICABLE LAW OR AGREED TO IN
 WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
 AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
 FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+CONSETQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
 LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
 RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
 FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp
index f53afc0c..469436bb 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( TQObject *parent, const char *name, const TQStringList & )
+JSConsolePlugin::JSConsolePlugin( TTQObject *parent, const char *name, const TTQStringList & )
     : KParts::Plugin( parent, name )
 {
     js = 0;
diff --git a/kjsembed/plugin/jsconsoleplugin.h b/kjsembed/plugin/jsconsoleplugin.h
index 18a17ed9..85b3bef4 100644
--- a/kjsembed/plugin/jsconsoleplugin.h
+++ b/kjsembed/plugin/jsconsoleplugin.h
@@ -39,7 +39,7 @@ class JSConsolePlugin : public KParts::Plugin
     Q_OBJECT
 
 public:
-    JSConsolePlugin( TQObject *parent, const char *name, const TQStringList & );
+    JSConsolePlugin( TTQObject *parent, const char *name, const TTQStringList & );
     ~JSConsolePlugin();
 
 private slots:
diff --git a/kjsembed/plugins/customobject_plugin.cpp b/kjsembed/plugins/customobject_plugin.cpp
index b883ff66..13bf0526 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;
-	TQString thing;
+	TTQString thing;
 };
 
-MyCustomObjectLoader::MyCustomObjectLoader( TQObject *parent, const char *name, const TQStringList &args ) :
+MyCustomObjectLoader::MyCustomObjectLoader( TTQObject *parent, const char *name, const TTQStringList &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;
 }
-TQString MyCustomObjectImp::extractString(KJS::ExecState *exec, const KJS::List &args, int idx)
+TTQString MyCustomObjectImp::extractString(KJS::ExecState *exec, const KJS::List &args, int idx)
 {
-     return (args.size() > idx) ? args[idx].toString(exec).qstring() : TQString::null;
+     return (args.size() > idx) ? args[idx].toString(exec).qstring() : TTQString::null;
 }
 
 } // namespace KJSEmbed::Bindings
diff --git a/kjsembed/plugins/customobject_plugin.h b/kjsembed/plugins/customobject_plugin.h
index 5f417e69..aef20616 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( TQObject *parent, const char *name, const TQStringList &args );
+    MyCustomObjectLoader( TTQObject *parent, const char *name, const TTQStringList &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);
-    TQString extractString(KJS::ExecState *exec, const KJS::List &args, int idx);
+    TTQString 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 6d1fccc7..8538dffc 100644
--- a/kjsembed/plugins/customqobject_plugin.cpp
+++ b/kjsembed/plugins/customqobject_plugin.cpp
@@ -32,20 +32,20 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-MyCustomQObjectLoader::MyCustomQObjectLoader( TQObject *parent, const char *name, const TQStringList &args ) :
+MyCustomTQObjectLoader::MyCustomTQObjectLoader( TTQObject *parent, const char *name, const TTQStringList &args ) :
 	JSBindingPlugin(parent, name, args)
 {
 }
 
-KJS::Object MyCustomQObjectLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const
+KJS::Object MyCustomTQObjectLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const
 {
 	kdDebug() << "Loading a custom object" << endl;
 
-	TQObject *parent = 0L;
+	TTQObject *parent = 0L;
 	JSObjectProxy *proxy = JSProxy::toObjectProxy( args[0].imp() );
 	if ( proxy )
 		parent = proxy->object();
-	MyCustomQObjectImp *imp =  new MyCustomQObjectImp(parent, "MyCustomQObject" );
+	MyCustomTQObjectImp *imp =  new MyCustomTQObjectImp(parent, "MyCustomTQObject" );
 	JSObjectProxy *prx = new JSObjectProxy( jspart, imp );
 
 	KJS::Object proxyObj( prx );
@@ -54,32 +54,32 @@ KJS::Object MyCustomQObjectLoader::createBinding(KJSEmbedPart *jspart, KJS::Exec
 	return proxyObj;
 }
 
-MyCustomQObjectImp::MyCustomQObjectImp(TQObject *parent, const char *name )
-    : TQObject(parent, name)
+MyCustomTQObjectImp::MyCustomTQObjectImp(TTQObject *parent, const char *name )
+    : TTQObject(parent, name)
 {
-	kdDebug() << "New MyCustomQObjectImp " << endl;
+	kdDebug() << "New MyCustomTQObjectImp " << endl;
 }
 
-MyCustomQObjectImp::~MyCustomQObjectImp()
+MyCustomTQObjectImp::~MyCustomTQObjectImp()
 {
 }
 
-MyCustomQObjectImp::Mode MyCustomQObjectImp::mode() const
+MyCustomTQObjectImp::Mode MyCustomTQObjectImp::mode() const
 {
 	kdDebug() << "mode() " << endl;
 	return m_mode;
 }
-void MyCustomQObjectImp::setMode( Mode md)
+void MyCustomTQObjectImp::setMode( Mode md)
 {
 	kdDebug() << "setMode() " << endl;
 	m_mode = md;
 }
-TQString MyCustomQObjectImp::thing() const
+TTQString MyCustomTQObjectImp::thing() const
 {
 	kdDebug() << "thing()" << endl;
 	return m_thing;
 }
-void MyCustomQObjectImp::setThing( const TQString &t)
+void MyCustomTQObjectImp::setThing( const TTQString &t)
 {
 	kdDebug() << "setThing() " << t << endl;
 	m_thing = t;
@@ -89,8 +89,8 @@ void MyCustomQObjectImp::setThing( const TQString &t)
 
 
 #include <kgenericfactory.h>
-typedef KGenericFactory<KJSEmbed::Bindings::MyCustomQObjectLoader> MyCustomQObjectLoaderFactory;
-K_EXPORT_COMPONENT_FACTORY( libcustomqobjectplugin, MyCustomQObjectLoaderFactory( "MyCustomQObjectLoader" ) )
+typedef KGenericFactory<KJSEmbed::Bindings::MyCustomTQObjectLoader> MyCustomTQObjectLoaderFactory;
+K_EXPORT_COMPONENT_FACTORY( libcustomqobjectplugin, MyCustomTQObjectLoaderFactory( "MyCustomTQObjectLoader" ) )
 
 
 #include "customqobject_plugin.moc"
diff --git a/kjsembed/plugins/customqobject_plugin.desktop b/kjsembed/plugins/customqobject_plugin.desktop
index 6be09b1b..7f4ae202 100644
--- a/kjsembed/plugins/customqobject_plugin.desktop
+++ b/kjsembed/plugins/customqobject_plugin.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=MyCustomQObject
+Name=MyCustomTQObject
 ServiceTypes=JSBindingPlugin/Binding
 Type=Service
 X-KDE-Library=libcustomqobjectplugin
diff --git a/kjsembed/plugins/customqobject_plugin.h b/kjsembed/plugins/customqobject_plugin.h
index b80ac67a..9af6aee6 100644
--- a/kjsembed/plugins/customqobject_plugin.h
+++ b/kjsembed/plugins/customqobject_plugin.h
@@ -19,8 +19,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef KJSEMBED_CUSTOMQOBJECT_PLUGIN_H
-#define KJSEMBED_CUSTOMQOBJECT_PLUGIN_H
+#ifndef KJSEMBED_CUSTOMTQOBJECT_PLUGIN_H
+#define KJSEMBED_CUSTOMTQOBJECT_PLUGIN_H
 
 #include <kjsembed/jsbindingplugin.h>
 #include <kjsembed/jsproxy_imp.h>
@@ -29,36 +29,36 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-class MyCustomQObjectLoader : public JSBindingPlugin
+class MyCustomTQObjectLoader : public JSBindingPlugin
 {
 public:
-    MyCustomQObjectLoader( TQObject *parent, const char *name, const TQStringList &args );
-    virtual ~MyCustomQObjectLoader(){;}
+    MyCustomTQObjectLoader( TTQObject *parent, const char *name, const TTQStringList &args );
+    virtual ~MyCustomTQObjectLoader(){;}
     KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const;
 };
 
 
-class MyCustomQObjectImp : public TQObject {
+class MyCustomTQObjectImp : public TTQObject {
 
 Q_OBJECT
 	
     /** Identifiers for the methods provided by this class. */
     enum Mode { On, Off };
 	Q_PROPERTY(Mode mode READ mode WRITE setMode)
-	Q_PROPERTY(TQString thing READ thing WRITE setThing)
+	Q_PROPERTY(TTQString thing READ thing WRITE setThing)
 	Q_ENUMS(Mode)
 public:
-    MyCustomQObjectImp( TQObject *parent, const char *name);
-    virtual ~MyCustomQObjectImp();
+    MyCustomTQObjectImp( TTQObject *parent, const char *name);
+    virtual ~MyCustomTQObjectImp();
 
 public slots:
 	Mode mode() const;
 	void setMode( Mode md);
-	TQString thing() const;
-	void setThing( const TQString &t);
+	TTQString thing() const;
+	void setThing( const TTQString &t);
 private:
 	Mode m_mode;
-	TQString m_thing;
+	TTQString m_thing;
 	
 };
 
diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp
index ba2181cc..7aa81b3c 100644
--- a/kjsembed/plugins/imagefx_plugin.cpp
+++ b/kjsembed/plugins/imagefx_plugin.cpp
@@ -36,7 +36,7 @@ namespace KJSEmbed {
 namespace Bindings {
 
 
-ImageFXLoader::ImageFXLoader( TQObject *parent, const char *name, const TQStringList &args ) :
+ImageFXLoader::ImageFXLoader( TTQObject *parent, const char *name, const TTQStringList &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: {
-            TQSize size = extractQSize(exec, args, 0);
-            TQColor ca = extractQColor(exec, args, 1);
-            TQColor cb = extractQColor(exec, args, 2);
+            TTQSize size = extractTQSize(exec, args, 0);
+            TTQColor ca = extractTQColor(exec, args, 1);
+            TTQColor cb = extractTQColor(exec, args, 2);
             int type = extractInt( exec, args, 3);
             int ncols = extractInt( exec, args, 4);
-	    TQImage img = KImageEffect::gradient(size, ca, cb, (KImageEffect::GradientType)type, ncols);
+	    TTQImage img = KImageEffect::gradient(size, ca, cb, (KImageEffect::GradientType)type, ncols);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodunbalancedGradient: {
-            TQSize size = extractQSize(exec, args, 0);
-            TQColor ca = extractQColor(exec, args, 1);
-            TQColor cb = extractQColor(exec, args, 2);
+            TTQSize size = extractTQSize(exec, args, 0);
+            TTQColor ca = extractTQColor(exec, args, 1);
+            TTQColor 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);
-            TQImage img = KImageEffect::unbalancedGradient(size, ca, cb, (KImageEffect::GradientType)type, xfactor, yfactor, ncols);
+            TTQImage img = KImageEffect::unbalancedGradient(size, ca, cb, (KImageEffect::GradientType)type, xfactor, yfactor, ncols);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodblendColor: {
-            TQColor clr = extractQColor(exec, args, 0);
-	    TQImage dst = extractQImage(exec, args, 1);
+            TTQColor clr = extractTQColor(exec, args, 0);
+	    TTQImage dst = extractTQImage(exec, args, 1);
             float opacity = (float)extractDouble(exec, args, 2);
-	    TQImage img = KImageEffect::blend(clr, dst, opacity);
+	    TTQImage img = KImageEffect::blend(clr, dst, opacity);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodblendImage: {
-            TQImage src = extractQImage(exec, args, 0);
-	    TQImage dst = extractQImage(exec, args, 1);
+            TTQImage src = extractTQImage(exec, args, 0);
+	    TTQImage dst = extractTQImage(exec, args, 1);
             float opacity = (float)extractDouble(exec, args, 2);
-	    TQImage img = KImageEffect::blend(src, dst, opacity);
+	    TTQImage img = KImageEffect::blend(src, dst, opacity);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodcomputeDestinationRect: {
-            TQSize lowerSize = extractQSize(exec, args, 0);
+            TTQSize lowerSize = extractTQSize(exec, args, 0);
             int disposition = extractInt(exec, args, 1);
-	    TQImage upper = extractQImage(exec, args, 2);
-	    TQRect rect = KImageEffect::computeDestinationRect(lowerSize,  (KImageEffect::Disposition) disposition, upper);
+	    TTQImage upper = extractTQImage(exec, args, 2);
+	    TTQRect rect = KImageEffect::computeDestinationRect(lowerSize,  (KImageEffect::Disposition) disposition, upper);
             retValue = convertToValue(exec, rect);
 	    break;
         }
     case MethodchannelIntensity: {
-    	    TQImage image = extractQImage(exec, args, 0);
+    	    TTQImage image = extractTQImage(exec, args, 0);
             float percent = (float)extractDouble(exec, args, 1);
             int channel = extractInt(exec, args, 2);
-	    TQImage img = KImageEffect::channelIntensity(image, percent, (KImageEffect::RGBComponent)channel);
+	    TTQImage img = KImageEffect::channelIntensity(image, percent, (KImageEffect::RGBComponent)channel);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case Methodfade: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
             float val = (float)extractDouble(exec, args, 1);
-            TQColor color = extractQColor(exec, args, 2);
-	    TQImage img = KImageEffect::fade(image, val, color);
+            TTQColor color = extractTQColor(exec, args, 2);
+	    TTQImage img = KImageEffect::fade(image, val, color);
             retValue = convertToValue(exec, img);
             break;
         }
     case Methodflatten: {
-            TQImage image = extractQImage(exec, args, 0);
-	    TQColor ca = extractQColor(exec, args, 1);
-            TQColor cb = extractQColor(exec, args, 2);
+            TTQImage image = extractTQImage(exec, args, 0);
+	    TTQColor ca = extractTQColor(exec, args, 1);
+            TTQColor cb = extractTQColor(exec, args, 2);
             int ncols = extractInt(exec, args, 3);
-	    TQImage img = KImageEffect::flatten(image, ca, cb, ncols);
+	    TTQImage img = KImageEffect::flatten(image, ca, cb, ncols);
             retValue = convertToValue(exec, img);
             break;
         }
     case Methodhash: {
 
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    int lite  = extractInt(exec, args, 1);
             int spacing = extractInt(exec, args, 2);
-	    TQImage img = KImageEffect::hash(image, (KImageEffect::Lighting)lite, spacing);
+	    TTQImage img = KImageEffect::hash(image, (KImageEffect::Lighting)lite, spacing);
             retValue = convertToValue(exec, img);
             break;
         }
     case Methodintensity: {
 
-	    TQImage image = extractQImage(exec, args, 0);
+	    TTQImage image = extractTQImage(exec, args, 0);
 	    float percent = (float)extractDouble(exec, args, 1);
-            TQImage img = KImageEffect::intensity(image, percent);
+            TTQImage img = KImageEffect::intensity(image, percent);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodmodulate: {
-            TQImage image = extractQImage(exec, args, 0);
-	    TQImage modImage = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
+	    TTQImage 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);
-	    TQImage img = KImageEffect::modulate(image, modImage, reverse, (KImageEffect::ModulationType)type, factor, (KImageEffect::RGBComponent)channel);
+	    TTQImage img = KImageEffect::modulate(image, modImage, reverse, (KImageEffect::ModulationType)type, factor, (KImageEffect::RGBComponent)channel);
             retValue = convertToValue(exec, img);
             break;
         }
 
     case MethodtoGray: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    bool fast = extractBool(exec, args, 1);
-            TQImage img = KImageEffect::toGray(image, fast);
+            TTQImage img = KImageEffect::toGray(image, fast);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methoddesaturate: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    float desat = (float)extractDouble(exec, args, 1);
-            TQImage img = KImageEffect::desaturate(image, desat);
+            TTQImage 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: {
 
-            TQImage image = extractQImage(exec, args, 0);
-	    TQColor col = extractQColor(exec, args, 1);
-            TQImage img = KImageEffect::selectedImage(image, col);
+            TTQImage image = extractTQImage(exec, args, 0);
+	    TTQColor col = extractTQColor(exec, args, 1);
+            TTQImage img = KImageEffect::selectedImage(image, col);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodcontrastHSV: {
-	    TQImage image = extractQImage(exec, args, 0);
+	    TTQImage image = extractTQImage(exec, args, 0);
 	    bool sharpen = extractBool(exec, args, 1);
             KImageEffect::contrastHSV(image, sharpen);
 	    retValue = convertToValue(exec, image);
             break;
         }
     case Methodnormalize: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
             KImageEffect::normalize(image);
 	    retValue = convertToValue(exec, image);
             break;
         }
     case Methodequalize: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
             KImageEffect::equalize(image);
 	    retValue = convertToValue(exec, image);
             break;
         }
     case Methodthreshold: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    uint value = extractUInt(exec, args, 1);
             KImageEffect::threshold(image, value);
 	    retValue = convertToValue(exec, image);
             break;
         }
     case Methodsolarize: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
             double factor = extractDouble(exec, args, 1);
             KImageEffect::solarize(image, factor);
 	    retValue = convertToValue(exec, image);
             break;
         }
     case Methodemboss: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    double radius = extractDouble(exec, args, 1);
             double sigma = extractDouble(exec, args, 2);
-            TQImage img = KImageEffect::emboss(image, radius, sigma);
+            TTQImage img = KImageEffect::emboss(image, radius, sigma);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methoddespeckle: {
-            TQImage image = extractQImage(exec, args, 0);
-	    TQImage img = KImageEffect::despeckle(image);
+            TTQImage image = extractTQImage(exec, args, 0);
+	    TTQImage img = KImageEffect::despeckle(image);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodcharcoal: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    double factor = extractDouble(exec, args, 1);
-            TQImage img = KImageEffect::charcoal( image, factor);
+            TTQImage img = KImageEffect::charcoal( image, factor);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodcharcoal2: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    double radius = extractDouble(exec, args, 1);
             double sigma = extractDouble(exec, args, 2);
-            TQImage img = KImageEffect::charcoal(image, radius, sigma);
+            TTQImage img = KImageEffect::charcoal(image, radius, sigma);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodrotate: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    int r = extractInt(exec, args, 1);
-            TQImage img = KImageEffect::rotate(image, (KImageEffect::RotateDirection) r);
+            TTQImage img = KImageEffect::rotate(image, (KImageEffect::RotateDirection) r);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodsample: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
             int width = extractInt(exec, args, 1);
             int height = extractInt(exec, args, 2);
-            TQImage img = KImageEffect::sample(image, width, height);
+            TTQImage img = KImageEffect::sample(image, width, height);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodaddNoise: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
             int type = extractInt(exec, args, 1);
-            TQImage img = KImageEffect::addNoise(image, (KImageEffect::NoiseType) type);
+            TTQImage img = KImageEffect::addNoise(image, (KImageEffect::NoiseType) type);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodblur: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    double radius = extractDouble(exec, args, 1);
             double sigma = extractDouble(exec, args, 2);
-            TQImage img = KImageEffect::blur(image, radius, sigma);
+            TTQImage img = KImageEffect::blur(image, radius, sigma);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodedge: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    double radius = extractDouble(exec, args, 1);
-            TQImage img = KImageEffect::edge(image, radius);
+            TTQImage img = KImageEffect::edge(image, radius);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case Methodimplode: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    double factor = extractDouble(exec, args, 1);
             uint background = extractUInt(exec, args, 2);
-            TQImage img = KImageEffect::implode(image, factor, background);
+            TTQImage img = KImageEffect::implode(image, factor, background);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case MethodoilPaintConvolve: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    double radius = extractDouble(exec, args, 1);
-            TQImage img = KImageEffect::oilPaintConvolve(image, radius);
+            TTQImage img = KImageEffect::oilPaintConvolve(image, radius);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodoilPaint: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
             int radius = extractInt(exec, args, 1);
-            TQImage img = KImageEffect::oilPaint(image, radius);
+            TTQImage img = KImageEffect::oilPaint(image, radius);
 	    retValue = convertToValue(exec, img);
             break;
         }
 
 
     case Methodsharpen: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    double factor = extractDouble(exec, args, 1);
-            TQImage img = KImageEffect::sharpen(image, factor);
+            TTQImage img = KImageEffect::sharpen(image, factor);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodsharpen2: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    double radius = extractDouble(exec, args, 1);
             double sigma = extractDouble(exec, args, 2);
-            TQImage img = KImageEffect::sharpen(image, radius, sigma);
+            TTQImage img = KImageEffect::sharpen(image, radius, sigma);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodspread: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    uint amount = extractUInt(exec, args, 1);
-            TQImage img = KImageEffect::spread(image, amount);
+            TTQImage img = KImageEffect::spread(image, amount);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case Methodshade: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    bool color_shading = extractBool(exec, args, 1);
             double azimuth = extractDouble(exec, args, 2);
             double elevation = extractDouble(exec, args, 3);
-            TQImage img = KImageEffect::shade(image, color_shading, azimuth, elevation);
+            TTQImage img = KImageEffect::shade(image, color_shading, azimuth, elevation);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case Methodswirl: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    double degrees  = extractDouble(exec, args, 1);
             uint background = extractUInt(exec, args, 2);
-            TQImage img = KImageEffect::swirl(image, degrees, background);
+            TTQImage img = KImageEffect::swirl(image, degrees, background);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case Methodwave: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    double amplitude  = extractDouble(exec, args, 1);
             double frequency  = extractDouble(exec, args, 2);
             uint background = extractUInt(exec, args, 3);
-            TQImage img = KImageEffect::wave(image, amplitude, frequency, background);
+            TTQImage img = KImageEffect::wave(image, amplitude, frequency, background);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case Methodcontrast: {
-            TQImage image = extractQImage(exec, args, 0);
+            TTQImage image = extractTQImage(exec, args, 0);
 	    int c = extractInt(exec, args, 1);
-            TQImage img = KImageEffect::contrast(image, c);
+            TTQImage img = KImageEffect::contrast(image, c);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case MethodbumpMap: {
-        TQImage mask = extractQImage(exec, args, 0);
-        TQImage img = bumpmap(img,
+        TTQImage mask = extractTQImage(exec, args, 0);
+        TTQImage 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 <zack@kde.org>
  */
-TQImage ImageFX::bumpmap(TQImage &img, TQImage &map, double azimuth, double elevation,
+TTQImage ImageFX::bumpmap(TTQImage &img, TTQImage &map, double azimuth, double elevation,
                int depth, int xofs, int yofs, int waterlevel,
                int ambient, bool compensate, bool invert,
                BumpmapType type, bool tiled)
 {
-    TQImage dst;
+    TTQImage 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 b4f4c6a6..7e1f10d0 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( TQObject *parent, const char *name, const TQStringList &args );
+    ImageFXLoader( TTQObject *parent, const char *name, const TTQStringList &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 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 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 channelIntensity(float percent,KImageEffect::RGBComponent channel);
-		void fade(float val, const TQColor &color);
-		void flatten(const TQColor &ca,const TQColor &cb, int ncols);
+		void fade(float val, const TTQColor &color);
+		void flatten(const TTQColor &ca,const TTQColor &cb, int ncols);
 		void hash(KImageEffect::Lighting lite,uint spacing);
 		void intensity(float percent);
-		void modulate(TQImage &modImage, bool reverse,KImageEffect::ModulationType type, int factor, KImageEffect::RGBComponent channel);
+		void modulate(TTQImage &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 TQColor *palette, int size);
-		void selectedImage(  const TQColor &col );
+		void dither(const TTQColor *palette, int size);
+		void selectedImage(  const TTQColor &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);
 		
-		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);
+		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);
 			
 		int mid;
 };
diff --git a/kjsembed/plugins/kfileitemloader.cpp b/kjsembed/plugins/kfileitemloader.cpp
index 55e86f76..d548e4bd 100644
--- a/kjsembed/plugins/kfileitemloader.cpp
+++ b/kjsembed/plugins/kfileitemloader.cpp
@@ -31,7 +31,7 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-KFileItemLoader::KFileItemLoader(TQObject *parent, const char *name, const TQStringList &args)
+KFileItemLoader::KFileItemLoader(TTQObject *parent, const char *name, const TTQStringList &args)
  : JSBindingPlugin(parent, name, args)
 {
 }
@@ -147,13 +147,13 @@ KJS::Value KJSEmbed::Bindings::KFileItemImp::call( KJS::ExecState * exec, KJS::O
 		break;
 	case Methodurl:
 	{
-		TQString url = obj->url().url();
+		TTQString url = obj->url().url();
 		retValue = KJS::String(url);
 		break;
 	}
 	case MethodsetUrl:
 	{
-		TQString url = extractQString(exec, args, 0);
+		TTQString url = extractTQString(exec, args, 0);
 		obj->setURL(url);
 		break;
 	}
diff --git a/kjsembed/plugins/kfileitemloader.h b/kjsembed/plugins/kfileitemloader.h
index 384379f3..bfa0ad89 100644
--- a/kjsembed/plugins/kfileitemloader.h
+++ b/kjsembed/plugins/kfileitemloader.h
@@ -34,7 +34,7 @@ namespace Bindings {
 class KFileItemLoader : public JSBindingPlugin
 {
 public:
-    KFileItemLoader(TQObject *parent, const char *name, const TQStringList &args);
+    KFileItemLoader(TTQObject *parent, const char *name, const TTQStringList &args);
 
     ~KFileItemLoader();
 
diff --git a/kjsembed/plugins/qprocess_plugin.cpp b/kjsembed/plugins/qprocess_plugin.cpp
index 3106fd8f..085334ef 100644
--- a/kjsembed/plugins/qprocess_plugin.cpp
+++ b/kjsembed/plugins/qprocess_plugin.cpp
@@ -32,7 +32,7 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-ProcessLoader::ProcessLoader( TQObject *parent, const char *name, const TQStringList &args ) :
+ProcessLoader::ProcessLoader( TTQObject *parent, const char *name, const TTQStringList &args ) :
 	JSBindingPlugin(parent, name, args)
 {
 }
@@ -41,7 +41,7 @@ KJS::Object ProcessLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *e
 {
 	kdDebug() << "Loading a process object" << endl;
 
-	TQObject *parent = 0L;
+	TTQObject *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(TQObject *parent, const char *name )
-    : TQProcess(parent, name)
+ProcessImp::ProcessImp(TTQObject *parent, const char *name )
+    : TTQProcess(parent, name)
 {
 	kdDebug() << "New ProcessImp " << endl;
 }
@@ -64,73 +64,73 @@ ProcessImp::~ProcessImp()
 {
 }
 
-TQStringList ProcessImp::arguments() const
+TTQStringList ProcessImp::arguments() const
 {
-	return TQProcess::arguments();
+	return TTQProcess::arguments();
 }
-void ProcessImp::setArguments( const TQStringList args)
+void ProcessImp::setArguments( const TTQStringList args)
 {
-	TQProcess::setArguments( args );
+	TTQProcess::setArguments( args );
 }
 
 ProcessImp::Communication ProcessImp::communication() const
 {
-	return (ProcessImp::Communication)TQProcess::communication();
+	return (ProcessImp::Communication)TTQProcess::communication();
 }
 void ProcessImp::setCommunication( Communication comm)
 {
-	TQProcess::setCommunication( comm );
+	TTQProcess::setCommunication( comm );
 }
 
 bool ProcessImp::canReadLineStdout() const
 {
-	return TQProcess::canReadLineStdout();
+	return TTQProcess::canReadLineStdout();
 }
 bool ProcessImp::canReadLineStderr() const
 {
-	return TQProcess::canReadLineStderr();
+	return TTQProcess::canReadLineStderr();
 }
 bool ProcessImp::isRunning() const
 {
-	return TQProcess::isRunning();
+	return TTQProcess::isRunning();
 }
 bool ProcessImp::normalExit() const
 {
-	return TQProcess::normalExit();
+	return TTQProcess::normalExit();
 }
 int ProcessImp::exitStatus() const
 {
-	return TQProcess::exitStatus();
+	return TTQProcess::exitStatus();
 }
 
 bool ProcessImp::start()
 {
-	return TQProcess::start( );
+	return TTQProcess::start( );
 }
 
-TQString ProcessImp::readLineStdout ()
+TTQString ProcessImp::readLineStdout ()
 {
-	return TQProcess::readLineStdout();
+	return TTQProcess::readLineStdout();
 }
 
-TQString ProcessImp::readLineStderr ()
+TTQString ProcessImp::readLineStderr ()
 {
-	return TQProcess::readLineStderr();
+	return TTQProcess::readLineStderr();
 }
 
-TQDir ProcessImp::workingDirectory () const
+TTQDir ProcessImp::workingDirectory () const
 {
-	return TQProcess::workingDirectory();
+	return TTQProcess::workingDirectory();
 }
 
-void ProcessImp::setWorkingDirectory ( const TQDir & dir )
+void ProcessImp::setWorkingDirectory ( const TTQDir & dir )
 {
-	TQProcess::setWorkingDirectory( dir );
+	TTQProcess::setWorkingDirectory( dir );
 }
 
-void ProcessImp::addArgument ( const TQString & arg )
+void ProcessImp::addArgument ( const TTQString & arg )
 {
-	TQProcess::addArgument( arg );
+	TTQProcess::addArgument( arg );
 }
 
 } // namespace KJSEmbed::Bindings
diff --git a/kjsembed/plugins/qprocess_plugin.h b/kjsembed/plugins/qprocess_plugin.h
index c5ffe4a5..66d79f99 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( TQObject *parent, const char *name, const TQStringList &args );
+    ProcessLoader( TTQObject *parent, const char *name, const TTQStringList &args );
     virtual ~ProcessLoader(){;}
     KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const;
 };
 
 
-class ProcessImp : public TQProcess {
+class ProcessImp : public TTQProcess {
 
 Q_OBJECT
 
     /** Identifiers for the methods provided by this class. */
 	enum Communication { Stdin = 0x01, Stdout = 0x02, Stderr = 0x04, DupStderr = 0x08 };
 
-	Q_PROPERTY(TQStringList arguments READ arguments WRITE setArguments )
+	Q_PROPERTY(TTQStringList 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( TQObject *parent = 0, const char *name = 0);
+    ProcessImp( TTQObject *parent = 0, const char *name = 0);
     virtual ~ProcessImp();
 
-    TQStringList arguments() const;
-    void setArguments( const TQStringList args);
+    TTQStringList arguments() const;
+    void setArguments( const TTQStringList args);
 
     Communication communication() const;
     void setCommunication( Communication comm);
@@ -73,11 +73,11 @@ public:
 
 public slots:
 	bool start();
-	virtual TQString readLineStdout ();
-	virtual TQString readLineStderr ();
-	TQDir workingDirectory () const;
-	void setWorkingDirectory ( const TQDir & dir );
-	void addArgument ( const TQString & arg );
+	virtual TTQString readLineStdout ();
+	virtual TTQString readLineStderr ();
+	TTQDir workingDirectory () const;
+	void setWorkingDirectory ( const TTQDir & dir );
+	void addArgument ( const TTQString & arg );
 };
 
 } // namespace
diff --git a/kjsembed/qjscmd.cpp b/kjsembed/qjscmd.cpp
index 005d0b9e..c985a6b3 100644
--- a/kjsembed/qjscmd.cpp
+++ b/kjsembed/qjscmd.cpp
@@ -40,9 +40,9 @@ int main( int argc, char **argv )
     RedirectIOToConsole();
 #   endif
 #endif
-    // Setup QApplication
-    TQApplication *app;
-    app = new TQApplication( argc, argv );
+    // Setup TQApplication
+    TTQApplication *app;
+    app = new TTQApplication( 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( TQString("include('cmdline.js');") );
+    part->execute( TTQString("include('cmdline.js');") );
 
     return result;
 }
diff --git a/kjsembed/qjscmd/qjscmd.pro b/kjsembed/qjscmd/qjscmd.pro
index a1c27cf7..e390cd87 100755
--- a/kjsembed/qjscmd/qjscmd.pro
+++ b/kjsembed/qjscmd/qjscmd.pro
@@ -2,7 +2,7 @@ include(../qjsembed.pri )
 INCLUDEPATH += ../.. .. ../kjsembed
 SOURCES += qjscmd.cpp
 LIBS += -L../bin -lqjsembed \
-        -lqui
+        -ltqui
 
 
 DEFINES += QT_ONLY 
diff --git a/kjsembed/qjscmdw/qjscmdw.pro b/kjsembed/qjscmdw/qjscmdw.pro
index f5913b1e..1b3457c8 100755
--- a/kjsembed/qjscmdw/qjscmdw.pro
+++ b/kjsembed/qjscmdw/qjscmdw.pro
@@ -2,7 +2,7 @@ include(../qjsembed.pri)
 
 INCLUDEPATH += ../.. .. ../kjsembed
 SOURCES += ../qjscmd/qjscmd.cpp
-LIBS += -L../bin -lqjsembed -lqui
+LIBS += -L../bin -lqjsembed -ltqui
 
 
 DEFINES += QT_ONLY 
diff --git a/kjsembed/qjsembed.nsi b/kjsembed/qjsembed.nsi
index 2e61ab5a..7d7e49ab 100755
--- a/kjsembed/qjsembed.nsi
+++ b/kjsembed/qjsembed.nsi
@@ -2,7 +2,7 @@
 !define VER_MINOR 0
 !define VER_FILE 10
 !define VER_DISPLAY "1.0 ${__TIMESTAMP__}"
-!define APP_NAME QJSEmbed
+!define APP_NAME TQJSEmbed
 !define APP_NAME_LC qjsembed
 
 
@@ -34,7 +34,7 @@ XPStyle on
 
 
 
-Section "${APP_NAME} SDK (Required)" secSDK
+Section "${APP_NAME} SDK (Retquired)" secSDK
         SectionIn RO
   SetDetailsPrint textonly
   DetailPrint "${APP_NAME} static library for embedding into Qt applications."
@@ -99,7 +99,7 @@ Section "${APP_NAME} Runtime" secRuntime
   File qjscmd\qjscmd.exe
   File qjscmdw\qjscmdw.exe
   File stdlib\cmdline.js
-  File "$%QTDIR%\bin\qt-mt*.dll"
+  File "$%QTDIR%\bin\tqt-mt*.dll"
 SectionEnd
 
 Section "${APP_NAME} Source" secSrc
diff --git a/kjsembed/qtbindings/qcanvas_imp.cpp b/kjsembed/qtbindings/qcanvas_imp.cpp
index f653416b..d686d862 100644
--- a/kjsembed/qtbindings/qcanvas_imp.cpp
+++ b/kjsembed/qtbindings/qcanvas_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasImp::QCanvasImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasImp::TQCanvasImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasImp::~QCanvasImp()
+TTQCanvasImp::~TQCanvasImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasImp *meth = new QCanvasImp( exec, methods[idx].id );
+            TQCanvasImp *meth = new TQCanvasImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QCanvasImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -116,11 +116,11 @@ void QCanvasImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasImp *meth = new QCanvasImp( exec, methods[idx].id );
+            TQCanvasImp *meth = new TQCanvasImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -129,77 +129,77 @@ void QCanvasImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQCanvas pointer from an Object.
+ * Extract a TTQCanvas pointer from an Object.
  */
-TQCanvas *QCanvasImp::toQCanvas( KJS::Object &self )
+TTQCanvas *TQCanvasImp::toTQCanvas( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvas *>( obj );
+           return dynamic_cast<TTQCanvas *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvas" )
+    if ( op->typeName() != "TTQCanvas" )
         return 0;
 
-    return op->toNative<TQCanvas>();
+    return op->toNative<TTQCanvas>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvas_1:
-             return QCanvas_1( exec, args );
+             return TQCanvas_1( exec, args );
              break;
 
          case Constructor_QCanvas_2:
-             return QCanvas_2( exec, args );
+             return TQCanvas_2( exec, args );
              break;
 
          case Constructor_QCanvas_3:
-             return QCanvas_3( exec, args );
+             return TQCanvas_3( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasImp::QCanvas_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasImp::TQCanvas_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TQObject *
+    // Unsupported parameter TTQObject *
 
-    TQObject * arg0 = extractQObject(exec,args,0);
+    TTQObject * 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 TQCanvas object
+    // We should now create an instance of the TTQCanvas object
 
-    TQCanvas *ret = new TQCanvas(
+    TTQCanvas *ret = new TTQCanvas(
 
           arg0,
           arg1 );
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvas");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TTQCanvas");
     return KJS::Object( prx );
 }
 
-KJS::Object QCanvasImp::QCanvas_2( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasImp::TQCanvas_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -207,23 +207,23 @@ KJS::Object QCanvasImp::QCanvas_2( KJS::ExecState *exec, const KJS::List &args )
     int arg1 = extractInt(exec, args, 1);
 
 
-    // We should now create an instance of the TQCanvas object
+    // We should now create an instance of the TTQCanvas object
 
-    TQCanvas *ret = new TQCanvas(
+    TTQCanvas *ret = new TTQCanvas(
 
           arg0,
           arg1 );
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvas");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TTQCanvas");
     return KJS::Object( prx );
 
 }
 
-KJS::Object QCanvasImp::QCanvas_3( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasImp::TQCanvas_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter QPixmap
+    // Unsupported parameter TQPixmap
 
-    TQPixmap arg0 = extractQPixmap(exec, args, 0);
+    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -234,9 +234,9 @@ KJS::Object QCanvasImp::QCanvas_3( KJS::ExecState *exec, const KJS::List &args )
     int arg4 = extractInt(exec, args, 4);
 
 
-    // We should now create an instance of the TQCanvas object
+    // We should now create an instance of the TTQCanvas object
 
-    TQCanvas *ret = new TQCanvas(
+    TTQCanvas *ret = new TTQCanvas(
 
           arg0,
           arg1,
@@ -244,13 +244,13 @@ KJS::Object QCanvasImp::QCanvas_3( KJS::ExecState *exec, const KJS::List &args )
           arg3,
           arg4 );
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvas");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TTQCanvas");
     return KJS::Object( prx );
 }
 
-KJS::Value QCanvasImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasImp::toQCanvas( self );
+    instance = TQCanvasImp::toTQCanvas( self );
 
     switch( id ) {
 
@@ -450,18 +450,18 @@ KJS::Value QCanvasImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS:
         break;
     }
 
-    TQString msg = i18n( "QCanvasImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasImp::setTiles_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::setTiles_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QPixmap
+    // Unsupported parameter TQPixmap
     return KJS::Value();
 
-    TQPixmap arg0; // Dummy
+    TTQPixmap arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -481,10 +481,10 @@ KJS::Value QCanvasImp::setTiles_5( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QCanvasImp::setBackgroundPixmap_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::setBackgroundPixmap_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPixmap arg0 = extractQPixmap(exec, args, 0);
+    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
       instance->setBackgroundPixmap(
        arg0 );
@@ -492,19 +492,19 @@ KJS::Value QCanvasImp::setBackgroundPixmap_6( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QCanvasImp::backgroundPixmap_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::backgroundPixmap_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQPixmap ret;
+    TTQPixmap ret;
       ret = instance->backgroundPixmap(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasImp::setBackgroundColor_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::setBackgroundColor_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQColor arg0 = extractQColor(exec, args, 0);
+    TTQColor arg0 = extractTQColor(exec, args, 0);
 
       instance->setBackgroundColor(
        arg0 );
@@ -512,15 +512,15 @@ KJS::Value QCanvasImp::setBackgroundColor_8( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QCanvasImp::backgroundColor_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::backgroundColor_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->backgroundColor(  );
-      return KJS::Value(); // Returns 'QColor'
+      return KJS::Value(); // Returns 'TQColor'
 
 }
 
-KJS::Value QCanvasImp::setTile_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::setTile_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -537,7 +537,7 @@ KJS::Value QCanvasImp::setTile_10( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QCanvasImp::tile_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::tile_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -552,7 +552,7 @@ KJS::Value QCanvasImp::tile_11( KJS::ExecState *exec, KJS::Object &obj, const KJ
 
 }
 
-KJS::Value QCanvasImp::tilesHorizontally_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::tilesHorizontally_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -561,7 +561,7 @@ KJS::Value QCanvasImp::tilesHorizontally_12( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QCanvasImp::tilesVertically_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::tilesVertically_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -570,7 +570,7 @@ KJS::Value QCanvasImp::tilesVertically_13( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasImp::tileWidth_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::tileWidth_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -579,7 +579,7 @@ KJS::Value QCanvasImp::tileWidth_14( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QCanvasImp::tileHeight_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::tileHeight_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -588,7 +588,7 @@ KJS::Value QCanvasImp::tileHeight_15( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QCanvasImp::resize_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::resize_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -602,7 +602,7 @@ KJS::Value QCanvasImp::resize_16( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QCanvasImp::width_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::width_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -611,7 +611,7 @@ KJS::Value QCanvasImp::width_17( KJS::ExecState *exec, KJS::Object &obj, const K
 
 }
 
-KJS::Value QCanvasImp::height_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::height_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -620,25 +620,25 @@ KJS::Value QCanvasImp::height_18( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QCanvasImp::size_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::size_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQSize ret;
+    TTQSize ret;
       ret = instance->size(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasImp::rect_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::rect_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQRect ret;
+    TTQRect ret;
       ret = instance->rect(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasImp::onCanvas_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::onCanvas_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -653,10 +653,10 @@ KJS::Value QCanvasImp::onCanvas_21( KJS::ExecState *exec, KJS::Object &obj, cons
 
 }
 
-KJS::Value QCanvasImp::onCanvas_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::onCanvas_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPoint arg0 = extractQPoint(exec, args, 0);
+    TTQPoint arg0 = extractTQPoint(exec, args, 0);
 
       bool ret;
       ret = instance->onCanvas(
@@ -665,7 +665,7 @@ KJS::Value QCanvasImp::onCanvas_22( KJS::ExecState *exec, KJS::Object &obj, cons
 
 }
 
-KJS::Value QCanvasImp::validChunk_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::validChunk_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -680,10 +680,10 @@ KJS::Value QCanvasImp::validChunk_23( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QCanvasImp::validChunk_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::validChunk_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPoint arg0 = extractQPoint(exec, args, 0);
+    TTQPoint arg0 = extractTQPoint(exec, args, 0);
 
       bool ret;
       ret = instance->validChunk(
@@ -692,7 +692,7 @@ KJS::Value QCanvasImp::validChunk_24( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QCanvasImp::chunkSize_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::chunkSize_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -701,7 +701,7 @@ KJS::Value QCanvasImp::chunkSize_25( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QCanvasImp::retune_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::retune_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -715,7 +715,7 @@ KJS::Value QCanvasImp::retune_26( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QCanvasImp::sameChunk_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::sameChunk_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -736,7 +736,7 @@ KJS::Value QCanvasImp::sameChunk_27( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QCanvasImp::setChangedChunk_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::setChangedChunk_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -750,7 +750,7 @@ KJS::Value QCanvasImp::setChangedChunk_28( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasImp::setChangedChunkContaining_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::setChangedChunkContaining_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -764,7 +764,7 @@ KJS::Value QCanvasImp::setChangedChunkContaining_29( KJS::ExecState *exec, KJS::
 
 }
 
-KJS::Value QCanvasImp::setAllChanged_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::setAllChanged_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->setAllChanged(  );
@@ -772,10 +772,10 @@ KJS::Value QCanvasImp::setAllChanged_30( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasImp::setChanged_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::setChanged_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQRect arg0 = extractQRect(exec, args, 0);
+    TTQRect arg0 = extractTQRect(exec, args, 0);
 
       instance->setChanged(
        arg0 );
@@ -783,10 +783,10 @@ KJS::Value QCanvasImp::setChanged_31( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QCanvasImp::setUnchanged_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::setUnchanged_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQRect arg0 = extractQRect(exec, args, 0);
+    TTQRect arg0 = extractTQRect(exec, args, 0);
 
       instance->setUnchanged(
        arg0 );
@@ -794,13 +794,13 @@ KJS::Value QCanvasImp::setUnchanged_32( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasImp::addItemToChunk_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::addItemToChunk_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasItem *
+    // Unsupported parameter TTQCanvasItem *
     return KJS::Value();
 
-    TQCanvasItem * arg0; // Dummy
+    TTQCanvasItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -814,13 +814,13 @@ KJS::Value QCanvasImp::addItemToChunk_33( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QCanvasImp::removeItemFromChunk_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::removeItemFromChunk_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasItem *
+    // Unsupported parameter TTQCanvasItem *
     return KJS::Value();
 
-    TQCanvasItem * arg0; // Dummy
+    TTQCanvasItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -834,13 +834,13 @@ KJS::Value QCanvasImp::removeItemFromChunk_34( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QCanvasImp::addItemToChunkContaining_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::addItemToChunkContaining_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasItem *
+    // Unsupported parameter TTQCanvasItem *
     return KJS::Value();
 
-    TQCanvasItem * arg0; // Dummy
+    TTQCanvasItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -854,13 +854,13 @@ KJS::Value QCanvasImp::addItemToChunkContaining_35( KJS::ExecState *exec, KJS::O
 
 }
 
-KJS::Value QCanvasImp::removeItemFromChunkContaining_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::removeItemFromChunkContaining_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasItem *
+    // Unsupported parameter TTQCanvasItem *
     return KJS::Value();
 
-    TQCanvasItem * arg0; // Dummy
+    TTQCanvasItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -874,45 +874,45 @@ KJS::Value QCanvasImp::removeItemFromChunkContaining_36( KJS::ExecState *exec, K
 
 }
 
-KJS::Value QCanvasImp::allItems_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::allItems_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->allItems(  );
-      return KJS::Value(); // Returns 'QCanvasItemList'
+      return KJS::Value(); // Returns 'TQCanvasItemList'
 
 }
 
-KJS::Value QCanvasImp::collisions_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::collisions_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPoint arg0 = extractQPoint(exec, args, 0);
+    TTQPoint arg0 = extractTQPoint(exec, args, 0);
 
       instance->collisions(
        arg0 );
-      return KJS::Value(); // Returns 'QCanvasItemList'
+      return KJS::Value(); // Returns 'TQCanvasItemList'
 
 }
 
-KJS::Value QCanvasImp::collisions_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::collisions_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQRect arg0 = extractQRect(exec, args, 0);
+    TTQRect arg0 = extractTQRect(exec, args, 0);
 
       instance->collisions(
        arg0 );
-      return KJS::Value(); // Returns 'QCanvasItemList'
+      return KJS::Value(); // Returns 'TQCanvasItemList'
 
 }
 
-KJS::Value QCanvasImp::collisions_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::collisions_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPointArray arg0; // TODO (hack for qcanvas)
+    TTQPointArray arg0; // TODO (hack for qcanvas)
 
-    // Unsupported parameter const TQCanvasItem *
+    // Unsupported parameter const TTQCanvasItem *
     return KJS::Value();
 
-    const TQCanvasItem * arg1; // Dummy
+    const TTQCanvasItem * arg1; // Dummy
 
     bool arg2 = extractBool(exec, args, 2);
 
@@ -920,19 +920,19 @@ KJS::Value QCanvasImp::collisions_40( KJS::ExecState *exec, KJS::Object &obj, co
        arg0,
        arg1,
        arg2 );
-      return KJS::Value(); // Returns 'QCanvasItemList'
+      return KJS::Value(); // Returns 'TQCanvasItemList'
 
 }
 
-KJS::Value QCanvasImp::drawArea_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::drawArea_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQRect arg0 = extractQRect(exec, args, 0);
+    TTQRect arg0 = extractTQRect(exec, args, 0);
 
-    // Unsupported parameter TQPainter *
+    // Unsupported parameter TTQPainter *
     return KJS::Value();
 
-    TQPainter * arg1; // Dummy
+    TTQPainter * arg1; // Dummy
 
     bool arg2 = extractBool(exec, args, 2);
 
@@ -944,13 +944,13 @@ KJS::Value QCanvasImp::drawArea_41( KJS::ExecState *exec, KJS::Object &obj, cons
 
 }
 
-KJS::Value QCanvasImp::addView_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::addView_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasView *
+    // Unsupported parameter TTQCanvasView *
     return KJS::Value();
 
-    TQCanvasView * arg0; // Dummy
+    TTQCanvasView * arg0; // Dummy
 
       instance->addView(
        arg0 );
@@ -958,13 +958,13 @@ KJS::Value QCanvasImp::addView_42( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QCanvasImp::removeView_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::removeView_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasView *
+    // Unsupported parameter TTQCanvasView *
     return KJS::Value();
 
-    TQCanvasView * arg0; // Dummy
+    TTQCanvasView * arg0; // Dummy
 
       instance->removeView(
        arg0 );
@@ -972,15 +972,15 @@ KJS::Value QCanvasImp::removeView_43( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QCanvasImp::drawCanvasArea_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::drawCanvasArea_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQRect arg0 = extractQRect(exec, args, 0);
+    TTQRect arg0 = extractTQRect(exec, args, 0);
 
-    // Unsupported parameter TQPainter *
+    // Unsupported parameter TTQPainter *
     return KJS::Value();
 
-    TQPainter * arg1; // Dummy
+    TTQPainter * arg1; // Dummy
 
     bool arg2 = extractBool(exec, args, 2);
 
@@ -992,20 +992,20 @@ KJS::Value QCanvasImp::drawCanvasArea_44( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QCanvasImp::drawViewArea_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::drawViewArea_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasView *
+    // Unsupported parameter TTQCanvasView *
     return KJS::Value();
 
-    TQCanvasView * arg0; // Dummy
+    TTQCanvasView * arg0; // Dummy
 
-    // Unsupported parameter TQPainter *
+    // Unsupported parameter TTQPainter *
     return KJS::Value();
 
-    TQPainter * arg1; // Dummy
+    TTQPainter * arg1; // Dummy
 
-    TQRect arg2 = extractQRect(exec, args, 2);
+    TTQRect arg2 = extractTQRect(exec, args, 2);
 
     bool arg3 = extractBool(exec, args, 3);
 
@@ -1018,13 +1018,13 @@ KJS::Value QCanvasImp::drawViewArea_45( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasImp::addItem_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::addItem_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasItem *
+    // Unsupported parameter TTQCanvasItem *
     return KJS::Value();
 
-    TQCanvasItem * arg0; // Dummy
+    TTQCanvasItem * arg0; // Dummy
 
       instance->addItem(
        arg0 );
@@ -1032,13 +1032,13 @@ KJS::Value QCanvasImp::addItem_46( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QCanvasImp::addAnimation_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::addAnimation_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasItem *
+    // Unsupported parameter TTQCanvasItem *
     return KJS::Value();
 
-    TQCanvasItem * arg0; // Dummy
+    TTQCanvasItem * arg0; // Dummy
 
       instance->addAnimation(
        arg0 );
@@ -1046,13 +1046,13 @@ KJS::Value QCanvasImp::addAnimation_47( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasImp::removeItem_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::removeItem_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasItem *
+    // Unsupported parameter TTQCanvasItem *
     return KJS::Value();
 
-    TQCanvasItem * arg0; // Dummy
+    TTQCanvasItem * arg0; // Dummy
 
       instance->removeItem(
        arg0 );
@@ -1060,13 +1060,13 @@ KJS::Value QCanvasImp::removeItem_48( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QCanvasImp::removeAnimation_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::removeAnimation_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasItem *
+    // Unsupported parameter TTQCanvasItem *
     return KJS::Value();
 
-    TQCanvasItem * arg0; // Dummy
+    TTQCanvasItem * arg0; // Dummy
 
       instance->removeAnimation(
        arg0 );
@@ -1074,7 +1074,7 @@ KJS::Value QCanvasImp::removeAnimation_49( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasImp::setAdvancePeriod_50( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::setAdvancePeriod_50( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1085,7 +1085,7 @@ KJS::Value QCanvasImp::setAdvancePeriod_50( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QCanvasImp::setUpdatePeriod_51( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::setUpdatePeriod_51( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1096,7 +1096,7 @@ KJS::Value QCanvasImp::setUpdatePeriod_51( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasImp::setDoubleBuffering_52( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasImp::setDoubleBuffering_52( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
diff --git a/kjsembed/qtbindings/qcanvas_imp.h b/kjsembed/qtbindings/qcanvas_imp.h
index 255bbe44..fd91b3ba 100644
--- a/kjsembed/qtbindings/qcanvas_imp.h
+++ b/kjsembed/qtbindings/qcanvas_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvas;
+class TTQCanvas;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvas;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvas methods.
+ * Wrapper class for TTQCanvas methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasImp : public JSProxyImp
+class TQCanvasImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -87,8 +87,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasImp();
+   TQCanvasImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -102,15 +102,15 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvas *toQCanvas( KJS::Object &object );
+   static TTQCanvas *toTQCanvas( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvas_1( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvas_2( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvas_3( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvas_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvas_2( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvas_3( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -182,7 +182,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvas *instance; // Temp
+   TTQCanvas *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.cpp b/kjsembed/qtbindings/qcanvasellipse_imp.cpp
index 6d9311e7..deab7241 100644
--- a/kjsembed/qtbindings/qcanvasellipse_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasellipse_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasEllipseImp::QCanvasEllipseImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasEllipseImp::TQCanvasEllipseImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasEllipseImp::~QCanvasEllipseImp()
+TTQCanvasEllipseImp::~TQCanvasEllipseImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasEllipseImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasEllipseImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasEllipseImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasEllipseImp *meth = new QCanvasEllipseImp( exec, methods[idx].id );
+            TQCanvasEllipseImp *meth = new TQCanvasEllipseImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QCanvasEllipseImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasEllipseImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasEllipseImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -77,11 +77,11 @@ void QCanvasEllipseImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasEllipseImp *meth = new QCanvasEllipseImp( exec, methods[idx].id );
+            TQCanvasEllipseImp *meth = new TQCanvasEllipseImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -90,89 +90,89 @@ void QCanvasEllipseImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQCanvasEllipse pointer from an Object.
+ * Extract a TTQCanvasEllipse pointer from an Object.
  */
-TQCanvasEllipse *QCanvasEllipseImp::toQCanvasEllipse( KJS::Object &self )
+TTQCanvasEllipse *TQCanvasEllipseImp::toTQCanvasEllipse( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasEllipse *>( obj );
+           return dynamic_cast<TTQCanvasEllipse *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvasEllipse" )
+    if ( op->typeName() != "TTQCanvasEllipse" )
         return 0;
 
-    return op->toNative<TQCanvasEllipse>();
+    return op->toNative<TTQCanvasEllipse>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasEllipseImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasEllipseImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvasEllipse_1:
-             return QCanvasEllipse_1( exec, args );
+             return TQCanvasEllipse_1( exec, args );
              break;
 
          case Constructor_QCanvasEllipse_2:
-             return QCanvasEllipse_2( exec, args );
+             return TQCanvasEllipse_2( exec, args );
              break;
 
          case Constructor_QCanvasEllipse_3:
-             return QCanvasEllipse_3( exec, args );
+             return TQCanvasEllipse_3( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasEllipseCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasEllipseCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasEllipseImp::QCanvasEllipse_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasEllipseImp::TQCanvasEllipse_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg0; // Dummy
+    TTQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TQCanvasEllipse object
+    // We should now create an instance of the TTQCanvasEllipse object
 
-    TQCanvasEllipse *ret = new TQCanvasEllipse(
+    TTQCanvasEllipse *ret = new TTQCanvasEllipse(
 
           arg0 );
 
 
 }
 
-KJS::Object QCanvasEllipseImp::QCanvasEllipse_2( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasEllipseImp::TQCanvasEllipse_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg2; // Dummy
+    TTQCanvas * arg2; // Dummy
 
 
-    // We should now create an instance of the TQCanvasEllipse object
+    // We should now create an instance of the TTQCanvasEllipse object
 
-    TQCanvasEllipse *ret = new TQCanvasEllipse(
+    TTQCanvasEllipse *ret = new TTQCanvasEllipse(
 
           arg0,
           arg1,
@@ -181,7 +181,7 @@ KJS::Object QCanvasEllipseImp::QCanvasEllipse_2( KJS::ExecState *exec, const KJS
 
 }
 
-KJS::Object QCanvasEllipseImp::QCanvasEllipse_3( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasEllipseImp::TQCanvasEllipse_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -192,15 +192,15 @@ KJS::Object QCanvasEllipseImp::QCanvasEllipse_3( KJS::ExecState *exec, const KJS
 
     int arg3 = extractInt(exec, args, 3);
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg4; // Dummy
+    TTQCanvas * arg4; // Dummy
 
 
-    // We should now create an instance of the TQCanvasEllipse object
+    // We should now create an instance of the TTQCanvasEllipse object
 
-    TQCanvasEllipse *ret = new TQCanvasEllipse(
+    TTQCanvasEllipse *ret = new TTQCanvasEllipse(
 
           arg0,
           arg1,
@@ -211,9 +211,9 @@ KJS::Object QCanvasEllipseImp::QCanvasEllipse_3( KJS::ExecState *exec, const KJS
 
 }
 
-KJS::Value QCanvasEllipseImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasEllipseImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasEllipseImp::toQCanvasEllipse( self );
+    instance = TQCanvasEllipseImp::toTQCanvasEllipse( self );
 
     switch( id ) {
 
@@ -257,12 +257,12 @@ KJS::Value QCanvasEllipseImp::call( KJS::ExecState *exec, KJS::Object &self, con
         break;
     }
 
-    TQString msg = i18n( "QCanvasEllipseImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasEllipseImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasEllipseImp::width_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasEllipseImp::width_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -271,7 +271,7 @@ KJS::Value QCanvasEllipseImp::width_5( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QCanvasEllipseImp::height_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasEllipseImp::height_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -280,7 +280,7 @@ KJS::Value QCanvasEllipseImp::height_6( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasEllipseImp::setSize_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasEllipseImp::setSize_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -294,7 +294,7 @@ KJS::Value QCanvasEllipseImp::setSize_7( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasEllipseImp::setAngles_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasEllipseImp::setAngles_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -308,7 +308,7 @@ KJS::Value QCanvasEllipseImp::setAngles_8( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasEllipseImp::angleStart_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasEllipseImp::angleStart_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -317,7 +317,7 @@ KJS::Value QCanvasEllipseImp::angleStart_9( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QCanvasEllipseImp::angleLength_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasEllipseImp::angleLength_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -326,21 +326,21 @@ KJS::Value QCanvasEllipseImp::angleLength_10( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QCanvasEllipseImp::areaPoints_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasEllipseImp::areaPoints_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->areaPoints(  );
-      return KJS::Value(); // Returns 'QPointArray'
+      return KJS::Value(); // Returns 'TQPointArray'
 
 }
 
-KJS::Value QCanvasEllipseImp::collidesWith_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasEllipseImp::collidesWith_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQCanvasItem *
+    // Unsupported parameter const TTQCanvasItem *
     return KJS::Value();
 
-    const TQCanvasItem * arg0; // Dummy
+    const TTQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
@@ -349,7 +349,7 @@ KJS::Value QCanvasEllipseImp::collidesWith_12( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QCanvasEllipseImp::rtti_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasEllipseImp::rtti_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.h b/kjsembed/qtbindings/qcanvasellipse_imp.h
index 2a61a439..a0a03c8a 100644
--- a/kjsembed/qtbindings/qcanvasellipse_imp.h
+++ b/kjsembed/qtbindings/qcanvasellipse_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasEllipse;
+class TTQCanvasEllipse;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasEllipse;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasEllipse methods.
+ * Wrapper class for TTQCanvasEllipse methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasEllipseImp : public JSProxyImp
+class TQCanvasEllipseImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -48,8 +48,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasEllipseImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasEllipseImp();
+   TQCanvasEllipseImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasEllipseImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -63,15 +63,15 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasEllipse *toQCanvasEllipse( KJS::Object &object );
+   static TTQCanvasEllipse *toTQCanvasEllipse( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvasEllipse_1( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvasEllipse_2( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvasEllipse_3( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasEllipse_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasEllipse_2( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasEllipse_3( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -104,7 +104,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvasEllipse *instance; // Temp
+   TTQCanvasEllipse *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasitem_imp.cpp b/kjsembed/qtbindings/qcanvasitem_imp.cpp
index 9a3d0a5b..9e009567 100644
--- a/kjsembed/qtbindings/qcanvasitem_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasitem_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasItemImp::QCanvasItemImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasItemImp::TQCanvasItemImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasItemImp::~QCanvasItemImp()
+TTQCanvasItemImp::~TQCanvasItemImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasItemImp *meth = new QCanvasItemImp( exec, methods[idx].id );
+            TQCanvasItemImp *meth = new TQCanvasItemImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -66,15 +66,15 @@ void QCanvasItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
     EnumValue enums[] = {
 
         // enum RttiValues
-        { "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 },
+        { "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 },
 	{ 0, 0 }
     };
 
@@ -89,7 +89,7 @@ void QCanvasItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -135,11 +135,11 @@ void QCanvasItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasItemImp *meth = new QCanvasItemImp( exec, methods[idx].id );
+            TQCanvasItemImp *meth = new TQCanvasItemImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -148,64 +148,64 @@ void QCanvasItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQCanvasItem pointer from an Object.
+ * Extract a TTQCanvasItem pointer from an Object.
  */
-TQCanvasItem *QCanvasItemImp::toQCanvasItem( KJS::Object &self )
+TTQCanvasItem *TQCanvasItemImp::toTQCanvasItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasItem *>( obj );
+           return dynamic_cast<TTQCanvasItem *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 /*
-    if ( !op->inherits(TQCANVASITEM_OBJECT_NAME_STRING) ) {
+    if ( !op->inherits(TTQCANVASITEM_OBJECT_NAME_STRING) ) {
 	kdDebug() << "Typename of opaque canvas item is " << op->typeName() << endl;
 	// Check superclasses
         return 0;
     }
 */
-    return op->toNative<TQCanvasItem>();
+    return op->toNative<TTQCanvasItem>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasItemImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasItemImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvasItem_1:
-             return QCanvasItem_1( exec, args );
+             return TQCanvasItem_1( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasItemCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasItemCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasItemImp::QCanvasItem_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasItemImp::TQCanvasItem_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
 #if 0 // This constructor has been disabled by the XSL template
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg0; // Dummy
+    TTQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TQCanvasItem object
+    // We should now create an instance of the TTQCanvasItem object
 
-    TQCanvasItem *ret = new TQCanvasItem(
+    TTQCanvasItem *ret = new TTQCanvasItem(
 
           arg0 );
 
@@ -215,13 +215,13 @@ KJS::Object QCanvasItemImp::QCanvasItem_1( KJS::ExecState *exec, const KJS::List
 
 }
 
-KJS::Value QCanvasItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasItemImp::toQCanvasItem( self );
+    instance = TQCanvasItemImp::toTQCanvasItem( self );
     /*
     if ( !instance )
     {
-       TQString msg = i18n( "QCanvasItemImp was not valid" );
+       TTQString msg = i18n( "TQCanvasItemImp was not valid" );
     return throwError(exec, msg,KJS::ReferenceError);
     }
     */
@@ -384,12 +384,12 @@ KJS::Value QCanvasItemImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    TQString msg = i18n( "QCanvasItemImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasItemImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasItemImp::x_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::x_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       double ret;
@@ -398,7 +398,7 @@ KJS::Value QCanvasItemImp::x_3( KJS::ExecState *exec, KJS::Object &obj, const KJ
 
 }
 
-KJS::Value QCanvasItemImp::y_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::y_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       double ret;
@@ -407,7 +407,7 @@ KJS::Value QCanvasItemImp::y_4( KJS::ExecState *exec, KJS::Object &obj, const KJ
 
 }
 
-KJS::Value QCanvasItemImp::z_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::z_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       double ret;
@@ -416,7 +416,7 @@ KJS::Value QCanvasItemImp::z_5( KJS::ExecState *exec, KJS::Object &obj, const KJ
 
 }
 
-KJS::Value QCanvasItemImp::moveBy_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::moveBy_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
@@ -430,7 +430,7 @@ KJS::Value QCanvasItemImp::moveBy_6( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QCanvasItemImp::move_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::move_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
@@ -444,7 +444,7 @@ KJS::Value QCanvasItemImp::move_7( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QCanvasItemImp::setX_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::setX_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
@@ -455,7 +455,7 @@ KJS::Value QCanvasItemImp::setX_8( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QCanvasItemImp::setY_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::setY_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
@@ -466,7 +466,7 @@ KJS::Value QCanvasItemImp::setY_9( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QCanvasItemImp::setZ_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::setZ_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
@@ -477,7 +477,7 @@ KJS::Value QCanvasItemImp::setZ_10( KJS::ExecState *exec, KJS::Object &obj, cons
 
 }
 
-KJS::Value QCanvasItemImp::animated_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::animated_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -486,7 +486,7 @@ KJS::Value QCanvasItemImp::animated_11( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasItemImp::setAnimated_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::setAnimated_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -497,7 +497,7 @@ KJS::Value QCanvasItemImp::setAnimated_12( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasItemImp::setVelocity_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::setVelocity_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
@@ -511,7 +511,7 @@ KJS::Value QCanvasItemImp::setVelocity_13( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasItemImp::setXVelocity_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::setXVelocity_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
@@ -522,7 +522,7 @@ KJS::Value QCanvasItemImp::setXVelocity_14( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QCanvasItemImp::setYVelocity_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::setYVelocity_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
@@ -533,7 +533,7 @@ KJS::Value QCanvasItemImp::setYVelocity_15( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QCanvasItemImp::xVelocity_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::xVelocity_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       double ret;
@@ -542,7 +542,7 @@ KJS::Value QCanvasItemImp::xVelocity_16( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasItemImp::yVelocity_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::yVelocity_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       double ret;
@@ -551,7 +551,7 @@ KJS::Value QCanvasItemImp::yVelocity_17( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasItemImp::advance_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::advance_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -562,13 +562,13 @@ KJS::Value QCanvasItemImp::advance_18( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QCanvasItemImp::collidesWith_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::collidesWith_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQCanvasItem *
+    // Unsupported parameter const TTQCanvasItem *
     return KJS::Value();
 
-    const TQCanvasItem * arg0; // Dummy
+    const TTQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
@@ -577,24 +577,24 @@ KJS::Value QCanvasItemImp::collidesWith_19( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QCanvasItemImp::collisions_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::collisions_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
 
       instance->collisions(
        arg0 );
-      return KJS::Value(); // Returns 'QCanvasItemList'
+      return KJS::Value(); // Returns 'TQCanvasItemList'
 
 }
 
-KJS::Value QCanvasItemImp::setCanvas_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::setCanvas_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Value();
 
-    TQCanvas * arg0; // Dummy
+    TTQCanvas * arg0; // Dummy
 
       instance->setCanvas(
        arg0 );
@@ -602,10 +602,10 @@ KJS::Value QCanvasItemImp::setCanvas_21( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasItemImp::draw_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::draw_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPainter arg0; // TODO (hack for qcanvas)
+    TTQPainter arg0; // TODO (hack for qcanvas)
 
       instance->draw(
        arg0 );
@@ -613,7 +613,7 @@ KJS::Value QCanvasItemImp::draw_22( KJS::ExecState *exec, KJS::Object &obj, cons
 
 }
 
-KJS::Value QCanvasItemImp::show_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::show_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->show(  );
@@ -621,7 +621,7 @@ KJS::Value QCanvasItemImp::show_23( KJS::ExecState *exec, KJS::Object &obj, cons
 
 }
 
-KJS::Value QCanvasItemImp::hide_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::hide_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->hide(  );
@@ -629,7 +629,7 @@ KJS::Value QCanvasItemImp::hide_24( KJS::ExecState *exec, KJS::Object &obj, cons
 
 }
 
-KJS::Value QCanvasItemImp::setVisible_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::setVisible_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -640,7 +640,7 @@ KJS::Value QCanvasItemImp::setVisible_25( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QCanvasItemImp::isVisible_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::isVisible_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -649,7 +649,7 @@ KJS::Value QCanvasItemImp::isVisible_26( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasItemImp::setSelected_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::setSelected_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -660,7 +660,7 @@ KJS::Value QCanvasItemImp::setSelected_27( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasItemImp::isSelected_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::isSelected_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -669,7 +669,7 @@ KJS::Value QCanvasItemImp::isSelected_28( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QCanvasItemImp::setEnabled_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::setEnabled_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -680,7 +680,7 @@ KJS::Value QCanvasItemImp::setEnabled_29( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QCanvasItemImp::isEnabled_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::isEnabled_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -689,7 +689,7 @@ KJS::Value QCanvasItemImp::isEnabled_30( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasItemImp::setActive_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::setActive_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -700,7 +700,7 @@ KJS::Value QCanvasItemImp::setActive_31( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasItemImp::isActive_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::isActive_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -709,7 +709,7 @@ KJS::Value QCanvasItemImp::isActive_32( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasItemImp::visible_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::visible_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -718,7 +718,7 @@ KJS::Value QCanvasItemImp::visible_33( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QCanvasItemImp::selected_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::selected_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -727,7 +727,7 @@ KJS::Value QCanvasItemImp::selected_34( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasItemImp::enabled_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::enabled_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -736,7 +736,7 @@ KJS::Value QCanvasItemImp::enabled_35( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QCanvasItemImp::active_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::active_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -745,7 +745,7 @@ KJS::Value QCanvasItemImp::active_36( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QCanvasItemImp::rtti_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::rtti_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -754,29 +754,29 @@ KJS::Value QCanvasItemImp::rtti_37( KJS::ExecState *exec, KJS::Object &obj, cons
 
 }
 
-KJS::Value QCanvasItemImp::boundingRect_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::boundingRect_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQRect ret;
+    TTQRect ret;
       ret = instance->boundingRect(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasItemImp::boundingRectAdvanced_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::boundingRectAdvanced_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQRect ret;
+    TTQRect ret;
       ret = instance->boundingRectAdvanced(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasItemImp::canvas_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemImp::canvas_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->canvas(  );
-      return KJS::Value(); // Returns 'TQCanvas *'
+      return KJS::Value(); // Returns 'TTQCanvas *'
 
 }
 
diff --git a/kjsembed/qtbindings/qcanvasitem_imp.h b/kjsembed/qtbindings/qcanvasitem_imp.h
index d0823afe..577bb7b1 100644
--- a/kjsembed/qtbindings/qcanvasitem_imp.h
+++ b/kjsembed/qtbindings/qcanvasitem_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasItem;
+class TTQCanvasItem;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasItem;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasItem methods.
+ * Wrapper class for TTQCanvasItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasItemImp : public JSProxyImp
+class TQCanvasItemImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -75,8 +75,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasItemImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasItemImp();
+   TQCanvasItemImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasItemImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -90,13 +90,13 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasItem *toQCanvasItem( KJS::Object &object );
+   static TTQCanvasItem *toTQCanvasItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvasItem_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasItem_1( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -158,7 +158,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvasItem *instance; // Temp
+   TTQCanvasItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
index fd87e511..31f027fd 100644
--- a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasItemListImp::QCanvasItemListImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasItemListImp::TQCanvasItemListImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasItemListImp::~QCanvasItemListImp()
+TTQCanvasItemListImp::~TQCanvasItemListImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasItemListImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasItemListImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasItemListImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &o
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasItemListImp *meth = new QCanvasItemListImp( exec, methods[idx].id );
+            TQCanvasItemListImp *meth = new TQCanvasItemListImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QCanvasItemListImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &o
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasItemListImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasItemListImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -70,11 +70,11 @@ void QCanvasItemListImp::addBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasItemListImp *meth = new QCanvasItemListImp( exec, methods[idx].id );
+            TQCanvasItemListImp *meth = new TQCanvasItemListImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -83,31 +83,31 @@ void QCanvasItemListImp::addBindings( KJS::ExecState *exec, KJS::Object &object
 }
 
 /**
- * Extract a TQCanvasItemList pointer from an Object.
+ * Extract a TTQCanvasItemList pointer from an Object.
  */
-TQCanvasItemList *QCanvasItemListImp::toQCanvasItemList( KJS::Object &self )
+TTQCanvasItemList *TQCanvasItemListImp::toTQCanvasItemList( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasItemList *>( obj );
+           return dynamic_cast<TTQCanvasItemList *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvasItemList" )
+    if ( op->typeName() != "TTQCanvasItemList" )
         return 0;
 
-    return op->toNative<TQCanvasItemList>();
+    return op->toNative<TTQCanvasItemList>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasItemListImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasItemListImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
@@ -115,14 +115,14 @@ KJS::Object QCanvasItemListImp::construct( KJS::ExecState *exec, const KJS::List
              break;
     }
 
-    TQString msg = i18n("QCanvasItemListCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasItemListCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasItemListImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasItemListImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasItemListImp::toQCanvasItemList( self );
+    instance = TQCanvasItemListImp::toTQCanvasItemList( self );
 
     switch( id ) {
 
@@ -138,12 +138,12 @@ KJS::Value QCanvasItemListImp::call( KJS::ExecState *exec, KJS::Object &self, co
         break;
     }
 
-    TQString msg = i18n( "QCanvasItemListImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasItemListImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasItemListImp::sort_1( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemListImp::sort_1( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->sort(  );
@@ -151,10 +151,10 @@ KJS::Value QCanvasItemListImp::sort_1( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QCanvasItemListImp::drawUnique_2( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasItemListImp::drawUnique_2( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPainter arg0; // TODO (hack for qcanvas)
+    TTQPainter arg0; // TODO (hack for qcanvas)
 
       instance->drawUnique(
        arg0 );
diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.h b/kjsembed/qtbindings/qcanvasitemlist_imp.h
index 3f2edae1..1ec604e0 100644
--- a/kjsembed/qtbindings/qcanvasitemlist_imp.h
+++ b/kjsembed/qtbindings/qcanvasitemlist_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasItemList;
+class TTQCanvasItemList;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasItemList;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasItemList methods.
+ * Wrapper class for TTQCanvasItemList methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasItemListImp : public JSProxyImp
+class TQCanvasItemListImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -38,8 +38,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasItemListImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasItemListImp();
+   TQCanvasItemListImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasItemListImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -53,7 +53,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasItemList *toQCanvasItemList( KJS::Object &object );
+   static TTQCanvasItemList *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:
-   TQCanvasItemList *instance; // Temp
+   TTQCanvasItemList *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasline_imp.cpp b/kjsembed/qtbindings/qcanvasline_imp.cpp
index 429321f3..af6a7b53 100644
--- a/kjsembed/qtbindings/qcanvasline_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasline_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasLineImp::QCanvasLineImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasLineImp::TQCanvasLineImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasLineImp::~QCanvasLineImp()
+TTQCanvasLineImp::~TQCanvasLineImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasLineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasLineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasLineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasLineImp *meth = new QCanvasLineImp( exec, methods[idx].id );
+            TQCanvasLineImp *meth = new TQCanvasLineImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QCanvasLineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasLineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasLineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -74,11 +74,11 @@ void QCanvasLineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasLineImp *meth = new QCanvasLineImp( exec, methods[idx].id );
+            TQCanvasLineImp *meth = new TQCanvasLineImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -87,68 +87,68 @@ void QCanvasLineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQCanvasLine pointer from an Object.
+ * Extract a TTQCanvasLine pointer from an Object.
  */
-TQCanvasLine *QCanvasLineImp::toQCanvasLine( KJS::Object &self )
+TTQCanvasLine *TQCanvasLineImp::toTQCanvasLine( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasLine *>( obj );
+           return dynamic_cast<TTQCanvasLine *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvasLine" )
+    if ( op->typeName() != "TTQCanvasLine" )
         return 0;
 
-    return op->toNative<TQCanvasLine>();
+    return op->toNative<TTQCanvasLine>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasLineImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasLineImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvasLine_1:
-             return QCanvasLine_1( exec, args );
+             return TQCanvasLine_1( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasLineCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasLineCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasLineImp::QCanvasLine_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasLineImp::TQCanvasLine_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg0; // Dummy
+    TTQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TQCanvasLine object
+    // We should now create an instance of the TTQCanvasLine object
 
-    TQCanvasLine *ret = new TQCanvasLine(
+    TTQCanvasLine *ret = new TTQCanvasLine(
 
           arg0 );
 
 
 }
 
-KJS::Value QCanvasLineImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasLineImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasLineImp::toQCanvasLine( self );
+    instance = TQCanvasLineImp::toTQCanvasLine( self );
 
     switch( id ) {
 
@@ -180,12 +180,12 @@ KJS::Value QCanvasLineImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    TQString msg = i18n( "QCanvasLineImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasLineImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasLineImp::setPoints_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasLineImp::setPoints_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -205,25 +205,25 @@ KJS::Value QCanvasLineImp::setPoints_3( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasLineImp::startPoint_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasLineImp::startPoint_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQPoint ret;
+    TTQPoint ret;
       ret = instance->startPoint(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasLineImp::endPoint_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasLineImp::endPoint_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQPoint ret;
+    TTQPoint ret;
       ret = instance->endPoint(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasLineImp::rtti_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasLineImp::rtti_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -232,13 +232,13 @@ KJS::Value QCanvasLineImp::rtti_6( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QCanvasLineImp::setPen_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasLineImp::setPen_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QPen
+    // Unsupported parameter TQPen
     return KJS::Value();
 
-    TQPen arg0; // Dummy
+    TTQPen arg0; // Dummy
 
       instance->setPen(
        arg0 );
@@ -246,7 +246,7 @@ KJS::Value QCanvasLineImp::setPen_7( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QCanvasLineImp::moveBy_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasLineImp::moveBy_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
diff --git a/kjsembed/qtbindings/qcanvasline_imp.h b/kjsembed/qtbindings/qcanvasline_imp.h
index 95ab8cb3..f876b8e1 100644
--- a/kjsembed/qtbindings/qcanvasline_imp.h
+++ b/kjsembed/qtbindings/qcanvasline_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasLine;
+class TTQCanvasLine;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasLine;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasLine methods.
+ * Wrapper class for TTQCanvasLine methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasLineImp : public JSProxyImp
+class TQCanvasLineImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -43,8 +43,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasLineImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasLineImp();
+   TQCanvasLineImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasLineImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -58,13 +58,13 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasLine *toQCanvasLine( KJS::Object &object );
+   static TTQCanvasLine *toTQCanvasLine( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvasLine_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasLine_1( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -94,7 +94,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvasLine *instance; // Temp
+   TTQCanvasLine *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
index 505cdb1f..bc11e8ce 100644
--- a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasPixmapImp::QCanvasPixmapImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasPixmapImp::TQCanvasPixmapImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasPixmapImp::~QCanvasPixmapImp()
+TTQCanvasPixmapImp::~TQCanvasPixmapImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasPixmapImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasPixmapImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasPixmapImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasPixmapImp *meth = new QCanvasPixmapImp( exec, methods[idx].id );
+            TQCanvasPixmapImp *meth = new TQCanvasPixmapImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QCanvasPixmapImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasPixmapImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasPixmapImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -71,11 +71,11 @@ void QCanvasPixmapImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasPixmapImp *meth = new QCanvasPixmapImp( exec, methods[idx].id );
+            TQCanvasPixmapImp *meth = new TQCanvasPixmapImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -84,79 +84,79 @@ void QCanvasPixmapImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQCanvasPixmap pointer from an Object.
+ * Extract a TTQCanvasPixmap pointer from an Object.
  */
-TQCanvasPixmap *QCanvasPixmapImp::toQCanvasPixmap( KJS::Object &self )
+TTQCanvasPixmap *TQCanvasPixmapImp::toTQCanvasPixmap( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasPixmap *>( obj );
+           return dynamic_cast<TTQCanvasPixmap *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvasPixmap" )
+    if ( op->typeName() != "TTQCanvasPixmap" )
         return 0;
 
-    return op->toNative<TQCanvasPixmap>();
+    return op->toNative<TTQCanvasPixmap>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasPixmapImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPixmapImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvasPixmap_1:
-             return QCanvasPixmap_1( exec, args );
+             return TQCanvasPixmap_1( exec, args );
              break;
 
          case Constructor_QCanvasPixmap_2:
-             return QCanvasPixmap_2( exec, args );
+             return TQCanvasPixmap_2( exec, args );
              break;
 
          case Constructor_QCanvasPixmap_3:
-             return QCanvasPixmap_3( exec, args );
+             return TQCanvasPixmap_3( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasPixmapCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasPixmapCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasPixmapImp::QCanvasPixmap_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPixmapImp::TQCanvasPixmap_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
 
-    // We should now create an instance of the TQCanvasPixmap object
+    // We should now create an instance of the TTQCanvasPixmap object
 
-    TQCanvasPixmap *ret = new TQCanvasPixmap(
+    TTQCanvasPixmap *ret = new TTQCanvasPixmap(
 
           arg0 );
 
 	return KJS::Object();
 }
 
-KJS::Object QCanvasPixmapImp::QCanvasPixmap_2( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPixmapImp::TQCanvasPixmap_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TQImage arg0 = extractQImage(exec, args, 0);
+    TTQImage arg0 = extractTQImage(exec, args, 0);
 
 
-    // We should now create an instance of the TQCanvasPixmap object
+    // We should now create an instance of the TTQCanvasPixmap object
 
-    TQCanvasPixmap *ret = new TQCanvasPixmap(
+    TTQCanvasPixmap *ret = new TTQCanvasPixmap(
 
           arg0 );
 
@@ -164,17 +164,17 @@ KJS::Object QCanvasPixmapImp::QCanvasPixmap_2( KJS::ExecState *exec, const KJS::
 
 }
 
-KJS::Object QCanvasPixmapImp::QCanvasPixmap_3( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPixmapImp::TQCanvasPixmap_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TQPixmap arg0 = extractQPixmap(exec, args, 0);
+    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
-    TQPoint arg1 = extractQPoint(exec, args, 1);
+    TTQPoint arg1 = extractTQPoint(exec, args, 1);
 
 
-    // We should now create an instance of the TQCanvasPixmap object
+    // We should now create an instance of the TTQCanvasPixmap object
 
-    TQCanvasPixmap *ret = new TQCanvasPixmap(
+    TTQCanvasPixmap *ret = new TTQCanvasPixmap(
 
           arg0,
           arg1 );
@@ -183,9 +183,9 @@ KJS::Object QCanvasPixmapImp::QCanvasPixmap_3( KJS::ExecState *exec, const KJS::
 
 }
 
-KJS::Value QCanvasPixmapImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasPixmapImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasPixmapImp::toQCanvasPixmap( self );
+    instance = TQCanvasPixmapImp::toTQCanvasPixmap( self );
 
     switch( id ) {
 
@@ -205,12 +205,12 @@ KJS::Value QCanvasPixmapImp::call( KJS::ExecState *exec, KJS::Object &self, cons
         break;
     }
 
-    TQString msg = i18n( "QCanvasPixmapImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasPixmapImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasPixmapImp::offsetX_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPixmapImp::offsetX_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -219,7 +219,7 @@ KJS::Value QCanvasPixmapImp::offsetX_5( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasPixmapImp::offsetY_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPixmapImp::offsetY_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -228,7 +228,7 @@ KJS::Value QCanvasPixmapImp::offsetY_6( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasPixmapImp::setOffset_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPixmapImp::setOffset_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.h b/kjsembed/qtbindings/qcanvaspixmap_imp.h
index 607ff4d4..958c5dda 100644
--- a/kjsembed/qtbindings/qcanvaspixmap_imp.h
+++ b/kjsembed/qtbindings/qcanvaspixmap_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasPixmap;
+class TTQCanvasPixmap;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasPixmap;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasPixmap methods.
+ * Wrapper class for TTQCanvasPixmap methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasPixmapImp : public JSProxyImp
+class TQCanvasPixmapImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -42,8 +42,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasPixmapImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasPixmapImp();
+   TQCanvasPixmapImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasPixmapImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -57,15 +57,15 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasPixmap *toQCanvasPixmap( KJS::Object &object );
+   static TTQCanvasPixmap *toTQCanvasPixmap( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvasPixmap_1( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvasPixmap_2( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvasPixmap_3( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasPixmap_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasPixmap_2( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasPixmap_3( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -92,7 +92,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvasPixmap *instance; // Temp
+   TTQCanvasPixmap *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
index d3f249d9..73a6f58b 100644
--- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasPixmapArrayImp::QCanvasPixmapArrayImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasPixmapArrayImp::TQCanvasPixmapArrayImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasPixmapArrayImp::~QCanvasPixmapArrayImp()
+TTQCanvasPixmapArrayImp::~TQCanvasPixmapArrayImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasPixmapArrayImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasPixmapArrayImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasPixmapArrayImp::addStaticBindings( KJS::ExecState *exec, KJS::Object
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasPixmapArrayImp *meth = new QCanvasPixmapArrayImp( exec, methods[idx].id );
+            TQCanvasPixmapArrayImp *meth = new TQCanvasPixmapArrayImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QCanvasPixmapArrayImp::addStaticBindings( KJS::ExecState *exec, KJS::Object
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasPixmapArrayImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasPixmapArrayImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -74,11 +74,11 @@ void QCanvasPixmapArrayImp::addBindings( KJS::ExecState *exec, KJS::Object &obje
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasPixmapArrayImp *meth = new QCanvasPixmapArrayImp( exec, methods[idx].id );
+            TQCanvasPixmapArrayImp *meth = new TQCanvasPixmapArrayImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -87,82 +87,82 @@ void QCanvasPixmapArrayImp::addBindings( KJS::ExecState *exec, KJS::Object &obje
 }
 
 /**
- * Extract a TQCanvasPixmapArray pointer from an Object.
+ * Extract a TTQCanvasPixmapArray pointer from an Object.
  */
-TQCanvasPixmapArray *QCanvasPixmapArrayImp::toQCanvasPixmapArray( KJS::Object &self )
+TTQCanvasPixmapArray *TQCanvasPixmapArrayImp::toTQCanvasPixmapArray( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasPixmapArray *>( obj );
+           return dynamic_cast<TTQCanvasPixmapArray *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvasPixmapArray" )
+    if ( op->typeName() != "TTQCanvasPixmapArray" )
         return 0;
 
-    return op->toNative<TQCanvasPixmapArray>();
+    return op->toNative<TTQCanvasPixmapArray>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasPixmapArrayImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPixmapArrayImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvasPixmapArray_1:
-             return QCanvasPixmapArray_1( exec, args );
+             return TQCanvasPixmapArray_1( exec, args );
              break;
 
          case Constructor_QCanvasPixmapArray_2:
-             return QCanvasPixmapArray_2( exec, args );
+             return TQCanvasPixmapArray_2( exec, args );
              break;
 
          case Constructor_QCanvasPixmapArray_3:
-             return QCanvasPixmapArray_3( exec, args );
+             return TQCanvasPixmapArray_3( exec, args );
              break;
 
          case Constructor_QCanvasPixmapArray_4:
-             return QCanvasPixmapArray_4( exec, args );
+             return TQCanvasPixmapArray_4( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasPixmapArrayCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasPixmapArrayCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPixmapArrayImp::TQCanvasPixmapArray_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
 
-    // We should now create an instance of the TQCanvasPixmapArray object
+    // We should now create an instance of the TTQCanvasPixmapArray object
 
-    TQCanvasPixmapArray *ret = new TQCanvasPixmapArray(
+    TTQCanvasPixmapArray *ret = new TTQCanvasPixmapArray(
         );
 
 	return KJS::Object();
 }
 
-KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_2( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPixmapArrayImp::TQCanvasPixmapArray_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
 
-    // We should now create an instance of the TQCanvasPixmapArray object
+    // We should now create an instance of the TTQCanvasPixmapArray object
 
-    TQCanvasPixmapArray *ret = new TQCanvasPixmapArray(
+    TTQCanvasPixmapArray *ret = new TTQCanvasPixmapArray(
 
           arg0,
           arg1 );
@@ -170,23 +170,23 @@ KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_2( KJS::ExecState *exec, c
 
 }
 
-KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_3( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPixmapArrayImp::TQCanvasPixmapArray_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TQPtrList< TQPixmap >
+    // Unsupported parameter TTQPtrList< TTQPixmap >
     return KJS::Object();
 
-    TQPtrList< TQPixmap > arg0; // Dummy
+    TTQPtrList< TTQPixmap > arg0; // Dummy
 
-    // Unsupported parameter TQPtrList< TQPoint >
+    // Unsupported parameter TTQPtrList< TTQPoint >
     return KJS::Object();
 
-    TQPtrList< TQPoint > arg1; // Dummy
+    TTQPtrList< TTQPoint > arg1; // Dummy
 
 
-    // We should now create an instance of the TQCanvasPixmapArray object
+    // We should now create an instance of the TTQCanvasPixmapArray object
 
-    TQCanvasPixmapArray *ret = new TQCanvasPixmapArray(
+    TTQCanvasPixmapArray *ret = new TTQCanvasPixmapArray(
 
           arg0,
           arg1 );
@@ -194,23 +194,23 @@ KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_3( KJS::ExecState *exec, c
 
 }
 
-KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_4( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPixmapArrayImp::TQCanvasPixmapArray_4( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TQValueList< TQPixmap >
+    // Unsupported parameter TTQValueList< TTQPixmap >
     return KJS::Object();
 
-    TQValueList< TQPixmap > arg0; // Dummy
+    TTQValueList< TTQPixmap > arg0; // Dummy
 
-    // Unsupported parameter QPointArray
+    // Unsupported parameter TQPointArray
     return KJS::Object();
 
-    TQPointArray arg1; // Dummy
+    TTQPointArray arg1; // Dummy
 
 
-    // We should now create an instance of the TQCanvasPixmapArray object
+    // We should now create an instance of the TTQCanvasPixmapArray object
 
-    TQCanvasPixmapArray *ret = new TQCanvasPixmapArray(
+    TTQCanvasPixmapArray *ret = new TTQCanvasPixmapArray(
 
           arg0,
           arg1 );
@@ -218,9 +218,9 @@ KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_4( KJS::ExecState *exec, c
 
 }
 
-KJS::Value QCanvasPixmapArrayImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasPixmapArrayImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasPixmapArrayImp::toQCanvasPixmapArray( self );
+    instance = TQCanvasPixmapArrayImp::toTQCanvasPixmapArray( self );
 
     switch( id ) {
 
@@ -252,15 +252,15 @@ KJS::Value QCanvasPixmapArrayImp::call( KJS::ExecState *exec, KJS::Object &self,
         break;
     }
 
-    TQString msg = i18n( "QCanvasPixmapArrayImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasPixmapArrayImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasPixmapArrayImp::readPixmaps_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPixmapArrayImp::readPixmaps_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -272,10 +272,10 @@ KJS::Value QCanvasPixmapArrayImp::readPixmaps_6( KJS::ExecState *exec, KJS::Obje
 
 }
 
-KJS::Value QCanvasPixmapArrayImp::readCollisionMasks_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPixmapArrayImp::readCollisionMasks_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
       bool ret;
       ret = instance->readCollisionMasks(
@@ -284,7 +284,7 @@ KJS::Value QCanvasPixmapArrayImp::readCollisionMasks_7( KJS::ExecState *exec, KJ
 
 }
 
-KJS::Value QCanvasPixmapArrayImp::isValid_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPixmapArrayImp::isValid_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -293,26 +293,26 @@ KJS::Value QCanvasPixmapArrayImp::isValid_9( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QCanvasPixmapArrayImp::image_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPixmapArrayImp::image_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
       instance->image(
        arg0 );
-      return KJS::Value(); // Returns 'TQCanvasPixmap *'
+      return KJS::Value(); // Returns 'TTQCanvasPixmap *'
 
 }
 
-KJS::Value QCanvasPixmapArrayImp::setImage_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPixmapArrayImp::setImage_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter TQCanvasPixmap *
+    // Unsupported parameter TTQCanvasPixmap *
     return KJS::Value();
 
-    TQCanvasPixmap * arg1; // Dummy
+    TTQCanvasPixmap * arg1; // Dummy
 
       instance->setImage(
        arg0,
@@ -321,7 +321,7 @@ KJS::Value QCanvasPixmapArrayImp::setImage_11( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QCanvasPixmapArrayImp::count_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPixmapArrayImp::count_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       uint ret;
diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
index c1dba541..32fd3d96 100644
--- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
+++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasPixmapArray;
+class TTQCanvasPixmapArray;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasPixmapArray;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasPixmapArray methods.
+ * Wrapper class for TTQCanvasPixmapArray methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasPixmapArrayImp : public JSProxyImp
+class TQCanvasPixmapArrayImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -46,8 +46,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasPixmapArrayImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasPixmapArrayImp();
+   TQCanvasPixmapArrayImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasPixmapArrayImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -61,16 +61,16 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasPixmapArray *toQCanvasPixmapArray( KJS::Object &object );
+   static TTQCanvasPixmapArray *toTQCanvasPixmapArray( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvasPixmapArray_1( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvasPixmapArray_2( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvasPixmapArray_3( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvasPixmapArray_4( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasPixmapArray_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasPixmapArray_2( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasPixmapArray_3( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasPixmapArray_4( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -100,7 +100,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvasPixmapArray *instance; // Temp
+   TTQCanvasPixmapArray *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
index 4064e3f0..37109043 100644
--- a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasPolygonImp::QCanvasPolygonImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasPolygonImp::TQCanvasPolygonImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasPolygonImp::~QCanvasPolygonImp()
+TTQCanvasPolygonImp::~TQCanvasPolygonImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasPolygonImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasPolygonImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasPolygonImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasPolygonImp *meth = new QCanvasPolygonImp( exec, methods[idx].id );
+            TQCanvasPolygonImp *meth = new TQCanvasPolygonImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QCanvasPolygonImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasPolygonImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasPolygonImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -73,11 +73,11 @@ void QCanvasPolygonImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasPolygonImp *meth = new QCanvasPolygonImp( exec, methods[idx].id );
+            TQCanvasPolygonImp *meth = new TQCanvasPolygonImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -86,68 +86,68 @@ void QCanvasPolygonImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQCanvasPolygon pointer from an Object.
+ * Extract a TTQCanvasPolygon pointer from an Object.
  */
-TQCanvasPolygon *QCanvasPolygonImp::toQCanvasPolygon( KJS::Object &self )
+TTQCanvasPolygon *TQCanvasPolygonImp::toTQCanvasPolygon( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasPolygon *>( obj );
+           return dynamic_cast<TTQCanvasPolygon *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvasPolygon" )
+    if ( op->typeName() != "TTQCanvasPolygon" )
         return 0;
 
-    return op->toNative<TQCanvasPolygon>();
+    return op->toNative<TTQCanvasPolygon>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasPolygonImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPolygonImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvasPolygon_1:
-             return QCanvasPolygon_1( exec, args );
+             return TQCanvasPolygon_1( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasPolygonCons has no constructor with id '%1',").arg(id);
+    TTQString msg = i18n("TQCanvasPolygonCons has no constructor with id '%1',").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasPolygonImp::QCanvasPolygon_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPolygonImp::TQCanvasPolygon_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg0; // Dummy
+    TTQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TQCanvasPolygon object
+    // We should now create an instance of the TTQCanvasPolygon object
 
-    TQCanvasPolygon *ret = new TQCanvasPolygon(
+    TTQCanvasPolygon *ret = new TTQCanvasPolygon(
 
           arg0 );
 
 
 }
 
-KJS::Value QCanvasPolygonImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasPolygonImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasPolygonImp::toQCanvasPolygon( self );
+    instance = TQCanvasPolygonImp::toTQCanvasPolygon( self );
 
     switch( id ) {
 
@@ -175,18 +175,18 @@ KJS::Value QCanvasPolygonImp::call( KJS::ExecState *exec, KJS::Object &self, con
         break;
     }
 
-    TQString msg = i18n( "QCanvasPolygonImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasPolygonImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasPolygonImp::setPoints_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonImp::setPoints_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QPointArray
+    // Unsupported parameter TQPointArray
     return KJS::Value();
 
-    TQPointArray arg0; // Dummy
+    TTQPointArray arg0; // Dummy
 
       instance->setPoints(
        arg0 );
@@ -194,15 +194,15 @@ KJS::Value QCanvasPolygonImp::setPoints_3( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasPolygonImp::points_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonImp::points_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->points(  );
-      return KJS::Value(); // Returns 'QPointArray'
+      return KJS::Value(); // Returns 'TQPointArray'
 
 }
 
-KJS::Value QCanvasPolygonImp::moveBy_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonImp::moveBy_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
@@ -216,15 +216,15 @@ KJS::Value QCanvasPolygonImp::moveBy_5( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasPolygonImp::areaPoints_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonImp::areaPoints_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->areaPoints(  );
-      return KJS::Value(); // Returns 'QPointArray'
+      return KJS::Value(); // Returns 'TQPointArray'
 
 }
 
-KJS::Value QCanvasPolygonImp::rtti_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonImp::rtti_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.h b/kjsembed/qtbindings/qcanvaspolygon_imp.h
index 98398bf0..aadcdf7f 100644
--- a/kjsembed/qtbindings/qcanvaspolygon_imp.h
+++ b/kjsembed/qtbindings/qcanvaspolygon_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasPolygon;
+class TTQCanvasPolygon;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasPolygon;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasPolygon methods.
+ * Wrapper class for TTQCanvasPolygon methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasPolygonImp : public JSProxyImp
+class TQCanvasPolygonImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -42,8 +42,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasPolygonImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasPolygonImp();
+   TQCanvasPolygonImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasPolygonImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -57,13 +57,13 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasPolygon *toQCanvasPolygon( KJS::Object &object );
+   static TTQCanvasPolygon *toTQCanvasPolygon( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvasPolygon_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasPolygon_1( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -92,7 +92,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvasPolygon *instance; // Temp
+   TTQCanvasPolygon *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
index 64500a9b..8dc06e3a 100644
--- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasPolygonalItemImp::QCanvasPolygonalItemImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasPolygonalItemImp::TQCanvasPolygonalItemImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasPolygonalItemImp::~QCanvasPolygonalItemImp()
+TTQCanvasPolygonalItemImp::~TQCanvasPolygonalItemImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasPolygonalItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasPolygonalItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasPolygonalItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Obje
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasPolygonalItemImp *meth = new QCanvasPolygonalItemImp( exec, methods[idx].id );
+            TQCanvasPolygonalItemImp *meth = new TQCanvasPolygonalItemImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QCanvasPolygonalItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Obje
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasPolygonalItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasPolygonalItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -77,11 +77,11 @@ void QCanvasPolygonalItemImp::addBindings( KJS::ExecState *exec, KJS::Object &ob
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasPolygonalItemImp *meth = new QCanvasPolygonalItemImp( exec, methods[idx].id );
+            TQCanvasPolygonalItemImp *meth = new TQCanvasPolygonalItemImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -90,61 +90,61 @@ void QCanvasPolygonalItemImp::addBindings( KJS::ExecState *exec, KJS::Object &ob
 }
 
 /**
- * Extract a TQCanvasPolygonalItem pointer from an Object.
+ * Extract a TTQCanvasPolygonalItem pointer from an Object.
  */
-TQCanvasPolygonalItem *QCanvasPolygonalItemImp::toQCanvasPolygonalItem( KJS::Object &self )
+TTQCanvasPolygonalItem *TQCanvasPolygonalItemImp::toTQCanvasPolygonalItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasPolygonalItem *>( obj );
+           return dynamic_cast<TTQCanvasPolygonalItem *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvasPolygonalItem" )
+    if ( op->typeName() != "TTQCanvasPolygonalItem" )
         return 0;
 
-    return op->toNative<TQCanvasPolygonalItem>();
+    return op->toNative<TTQCanvasPolygonalItem>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasPolygonalItemImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPolygonalItemImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvasPolygonalItem_1:
-             return QCanvasPolygonalItem_1( exec, args );
+             return TQCanvasPolygonalItem_1( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasPolygonalItemCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasPolygonalItemCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasPolygonalItemImp::QCanvasPolygonalItem_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasPolygonalItemImp::TQCanvasPolygonalItem_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
 #if 0 // This constructor has been disabled by the XSL template
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg0; // Dummy
+    TTQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TQCanvasPolygonalItem object
+    // We should now create an instance of the TTQCanvasPolygonalItem object
 
-    TQCanvasPolygonalItem *ret = new TQCanvasPolygonalItem(
+    TTQCanvasPolygonalItem *ret = new TTQCanvasPolygonalItem(
 
           arg0 );
 
@@ -153,9 +153,9 @@ KJS::Object QCanvasPolygonalItemImp::QCanvasPolygonalItem_1( KJS::ExecState *exe
 	return KJS::Object();
 }
 
-KJS::Value QCanvasPolygonalItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasPolygonalItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasPolygonalItemImp::toQCanvasPolygonalItem( self );
+    instance = TQCanvasPolygonalItemImp::toTQCanvasPolygonalItem( self );
 
     switch( id ) {
 
@@ -199,18 +199,18 @@ KJS::Value QCanvasPolygonalItemImp::call( KJS::ExecState *exec, KJS::Object &sel
         break;
     }
 
-    TQString msg = i18n( "QCanvasPolygonalItemImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasPolygonalItemImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasPolygonalItemImp::collidesWith_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonalItemImp::collidesWith_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQCanvasItem *
+    // Unsupported parameter const TTQCanvasItem *
     return KJS::Value();
 
-    const TQCanvasItem * arg0; // Dummy
+    const TTQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
@@ -219,13 +219,13 @@ KJS::Value QCanvasPolygonalItemImp::collidesWith_3( KJS::ExecState *exec, KJS::O
 
 }
 
-KJS::Value QCanvasPolygonalItemImp::setPen_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonalItemImp::setPen_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QPen
+    // Unsupported parameter TQPen
     return KJS::Value();
 
-    TQPen arg0; // Dummy
+    TTQPen arg0; // Dummy
 
       instance->setPen(
        arg0 );
@@ -233,13 +233,13 @@ KJS::Value QCanvasPolygonalItemImp::setPen_4( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QCanvasPolygonalItemImp::setBrush_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonalItemImp::setBrush_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QBrush
+    // Unsupported parameter TQBrush
     return KJS::Value();
 
-    TQBrush arg0; // Dummy
+    TTQBrush arg0; // Dummy
 
       instance->setBrush(
        arg0 );
@@ -247,50 +247,50 @@ KJS::Value QCanvasPolygonalItemImp::setBrush_5( KJS::ExecState *exec, KJS::Objec
 
 }
 
-KJS::Value QCanvasPolygonalItemImp::pen_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonalItemImp::pen_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQPen ret;
+    TTQPen ret;
       ret = instance->pen(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasPolygonalItemImp::brush_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonalItemImp::brush_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQBrush ret;
+    TTQBrush ret;
       ret = instance->brush(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasPolygonalItemImp::areaPoints_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonalItemImp::areaPoints_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->areaPoints(  );
-      return KJS::Value(); // Returns 'QPointArray'
+      return KJS::Value(); // Returns 'TQPointArray'
 
 }
 
-KJS::Value QCanvasPolygonalItemImp::areaPointsAdvanced_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonalItemImp::areaPointsAdvanced_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->areaPointsAdvanced(  );
-      return KJS::Value(); // Returns 'QPointArray'
+      return KJS::Value(); // Returns 'TQPointArray'
 
 }
 
-KJS::Value QCanvasPolygonalItemImp::boundingRect_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonalItemImp::boundingRect_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQRect ret;
+    TTQRect ret;
       ret = instance->boundingRect(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasPolygonalItemImp::rtti_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasPolygonalItemImp::rtti_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
index 389ed346..80ff4445 100644
--- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
+++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasPolygonalItem;
+class TTQCanvasPolygonalItem;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasPolygonalItem;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasPolygonalItem methods.
+ * Wrapper class for TTQCanvasPolygonalItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasPolygonalItemImp : public JSProxyImp
+class TQCanvasPolygonalItemImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -46,8 +46,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasPolygonalItemImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasPolygonalItemImp();
+   TQCanvasPolygonalItemImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasPolygonalItemImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -61,13 +61,13 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasPolygonalItem *toQCanvasPolygonalItem( KJS::Object &object );
+   static TTQCanvasPolygonalItem *toTQCanvasPolygonalItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvasPolygonalItem_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasPolygonalItem_1( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -100,7 +100,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvasPolygonalItem *instance; // Temp
+   TTQCanvasPolygonalItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
index 72c7ee08..19564e7b 100644
--- a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasRectangleImp::QCanvasRectangleImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasRectangleImp::TQCanvasRectangleImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasRectangleImp::~QCanvasRectangleImp()
+TTQCanvasRectangleImp::~TQCanvasRectangleImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasRectangleImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasRectangleImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasRectangleImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasRectangleImp *meth = new QCanvasRectangleImp( exec, methods[idx].id );
+            TQCanvasRectangleImp *meth = new TQCanvasRectangleImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QCanvasRectangleImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasRectangleImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasRectangleImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -76,11 +76,11 @@ void QCanvasRectangleImp::addBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasRectangleImp *meth = new QCanvasRectangleImp( exec, methods[idx].id );
+            TQCanvasRectangleImp *meth = new TQCanvasRectangleImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -89,87 +89,87 @@ void QCanvasRectangleImp::addBindings( KJS::ExecState *exec, KJS::Object &object
 }
 
 /**
- * Extract a TQCanvasRectangle pointer from an Object.
+ * Extract a TTQCanvasRectangle pointer from an Object.
  */
-TQCanvasRectangle *QCanvasRectangleImp::toQCanvasRectangle( KJS::Object &self )
+TTQCanvasRectangle *TQCanvasRectangleImp::toTQCanvasRectangle( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasRectangle *>( obj );
+           return dynamic_cast<TTQCanvasRectangle *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvasRectangle" )
+    if ( op->typeName() != "TTQCanvasRectangle" )
         return 0;
 
-    return op->toNative<TQCanvasRectangle>();
+    return op->toNative<TTQCanvasRectangle>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasRectangleImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasRectangleImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvasRectangle_1:
-             return QCanvasRectangle_1( exec, args );
+             return TQCanvasRectangle_1( exec, args );
              break;
 
          case Constructor_QCanvasRectangle_2:
-             return QCanvasRectangle_2( exec, args );
+             return TQCanvasRectangle_2( exec, args );
              break;
 
          case Constructor_QCanvasRectangle_3:
-             return QCanvasRectangle_3( exec, args );
+             return TQCanvasRectangle_3( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasRectangleCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasRectangleCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasRectangleImp::QCanvasRectangle_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasRectangleImp::TQCanvasRectangle_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg0; // Dummy
+    TTQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TQCanvasRectangle object
+    // We should now create an instance of the TTQCanvasRectangle object
 
-    TQCanvasRectangle *ret = new TQCanvasRectangle(
+    TTQCanvasRectangle *ret = new TTQCanvasRectangle(
 
           arg0 );
 
 
 }
 
-KJS::Object QCanvasRectangleImp::QCanvasRectangle_2( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasRectangleImp::TQCanvasRectangle_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TQRect arg0 = extractQRect(exec, args, 0);
+    TTQRect arg0 = extractTQRect(exec, args, 0);
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg1; // Dummy
+    TTQCanvas * arg1; // Dummy
 
 
-    // We should now create an instance of the TQCanvasRectangle object
+    // We should now create an instance of the TTQCanvasRectangle object
 
-    TQCanvasRectangle *ret = new TQCanvasRectangle(
+    TTQCanvasRectangle *ret = new TTQCanvasRectangle(
 
           arg0,
           arg1 );
@@ -177,7 +177,7 @@ KJS::Object QCanvasRectangleImp::QCanvasRectangle_2( KJS::ExecState *exec, const
 
 }
 
-KJS::Object QCanvasRectangleImp::QCanvasRectangle_3( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasRectangleImp::TQCanvasRectangle_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -188,15 +188,15 @@ KJS::Object QCanvasRectangleImp::QCanvasRectangle_3( KJS::ExecState *exec, const
 
     int arg3 = extractInt(exec, args, 3);
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg4; // Dummy
+    TTQCanvas * arg4; // Dummy
 
 
-    // We should now create an instance of the TQCanvasRectangle object
+    // We should now create an instance of the TTQCanvasRectangle object
 
-    TQCanvasRectangle *ret = new TQCanvasRectangle(
+    TTQCanvasRectangle *ret = new TTQCanvasRectangle(
 
           arg0,
           arg1,
@@ -207,9 +207,9 @@ KJS::Object QCanvasRectangleImp::QCanvasRectangle_3( KJS::ExecState *exec, const
 
 }
 
-KJS::Value QCanvasRectangleImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasRectangleImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasRectangleImp::toQCanvasRectangle( self );
+    instance = TQCanvasRectangleImp::toTQCanvasRectangle( self );
 
     switch( id ) {
 
@@ -249,12 +249,12 @@ KJS::Value QCanvasRectangleImp::call( KJS::ExecState *exec, KJS::Object &self, c
         break;
     }
 
-    TQString msg = i18n( "QCanvasRectangleImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasRectangleImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasRectangleImp::width_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasRectangleImp::width_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -263,7 +263,7 @@ KJS::Value QCanvasRectangleImp::width_5( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasRectangleImp::height_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasRectangleImp::height_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -272,7 +272,7 @@ KJS::Value QCanvasRectangleImp::height_6( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QCanvasRectangleImp::setSize_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasRectangleImp::setSize_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -286,39 +286,39 @@ KJS::Value QCanvasRectangleImp::setSize_7( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasRectangleImp::size_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasRectangleImp::size_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQSize ret;
+    TTQSize ret;
       ret = instance->size(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasRectangleImp::areaPoints_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasRectangleImp::areaPoints_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->areaPoints(  );
-      return KJS::Value(); // Returns 'QPointArray'
+      return KJS::Value(); // Returns 'TQPointArray'
 
 }
 
-KJS::Value QCanvasRectangleImp::rect_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasRectangleImp::rect_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQRect ret;
+    TTQRect ret;
       ret = instance->rect(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasRectangleImp::collidesWith_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasRectangleImp::collidesWith_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQCanvasItem *
+    // Unsupported parameter const TTQCanvasItem *
     return KJS::Value();
 
-    const TQCanvasItem * arg0; // Dummy
+    const TTQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
@@ -327,7 +327,7 @@ KJS::Value QCanvasRectangleImp::collidesWith_11( KJS::ExecState *exec, KJS::Obje
 
 }
 
-KJS::Value QCanvasRectangleImp::rtti_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasRectangleImp::rtti_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.h b/kjsembed/qtbindings/qcanvasrectangle_imp.h
index 1e141fe2..3daf243a 100644
--- a/kjsembed/qtbindings/qcanvasrectangle_imp.h
+++ b/kjsembed/qtbindings/qcanvasrectangle_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasRectangle;
+class TTQCanvasRectangle;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasRectangle;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasRectangle methods.
+ * Wrapper class for TTQCanvasRectangle methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasRectangleImp : public JSProxyImp
+class TQCanvasRectangleImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -47,8 +47,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasRectangleImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasRectangleImp();
+   TQCanvasRectangleImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasRectangleImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -62,15 +62,15 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasRectangle *toQCanvasRectangle( KJS::Object &object );
+   static TTQCanvasRectangle *toTQCanvasRectangle( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvasRectangle_1( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvasRectangle_2( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvasRectangle_3( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasRectangle_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasRectangle_2( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasRectangle_3( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -102,7 +102,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvasRectangle *instance; // Temp
+   TTQCanvasRectangle *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasspline_imp.cpp b/kjsembed/qtbindings/qcanvasspline_imp.cpp
index 54edeb8f..26e4c4c7 100644
--- a/kjsembed/qtbindings/qcanvasspline_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasspline_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasSplineImp::QCanvasSplineImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasSplineImp::TQCanvasSplineImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasSplineImp::~QCanvasSplineImp()
+TTQCanvasSplineImp::~TQCanvasSplineImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasSplineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasSplineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasSplineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasSplineImp *meth = new QCanvasSplineImp( exec, methods[idx].id );
+            TQCanvasSplineImp *meth = new TQCanvasSplineImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QCanvasSplineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasSplineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasSplineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -72,11 +72,11 @@ void QCanvasSplineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasSplineImp *meth = new QCanvasSplineImp( exec, methods[idx].id );
+            TQCanvasSplineImp *meth = new TQCanvasSplineImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -85,68 +85,68 @@ void QCanvasSplineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQCanvasSpline pointer from an Object.
+ * Extract a TTQCanvasSpline pointer from an Object.
  */
-TQCanvasSpline *QCanvasSplineImp::toQCanvasSpline( KJS::Object &self )
+TTQCanvasSpline *TQCanvasSplineImp::toTQCanvasSpline( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasSpline *>( obj );
+           return dynamic_cast<TTQCanvasSpline *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvasSpline" )
+    if ( op->typeName() != "TTQCanvasSpline" )
         return 0;
 
-    return op->toNative<TQCanvasSpline>();
+    return op->toNative<TTQCanvasSpline>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasSplineImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasSplineImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvasSpline_1:
-             return QCanvasSpline_1( exec, args );
+             return TQCanvasSpline_1( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasSplineCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasSplineCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasSplineImp::QCanvasSpline_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasSplineImp::TQCanvasSpline_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg0; // Dummy
+    TTQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TQCanvasSpline object
+    // We should now create an instance of the TTQCanvasSpline object
 
-    TQCanvasSpline *ret = new TQCanvasSpline(
+    TTQCanvasSpline *ret = new TTQCanvasSpline(
 
           arg0 );
 
 
 }
 
-KJS::Value QCanvasSplineImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasSplineImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasSplineImp::toQCanvasSpline( self );
+    instance = TQCanvasSplineImp::toTQCanvasSpline( self );
 
     switch( id ) {
 
@@ -170,18 +170,18 @@ KJS::Value QCanvasSplineImp::call( KJS::ExecState *exec, KJS::Object &self, cons
         break;
     }
 
-    TQString msg = i18n( "QCanvasSplineImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasSplineImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasSplineImp::setControlPoints_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSplineImp::setControlPoints_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QPointArray
+    // Unsupported parameter TQPointArray
     return KJS::Value();
 
-    TQPointArray arg0; // Dummy
+    TTQPointArray arg0; // Dummy
 
     bool arg1 = extractBool(exec, args, 1);
 
@@ -192,15 +192,15 @@ KJS::Value QCanvasSplineImp::setControlPoints_3( KJS::ExecState *exec, KJS::Obje
 
 }
 
-KJS::Value QCanvasSplineImp::controlPoints_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSplineImp::controlPoints_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->controlPoints(  );
-      return KJS::Value(); // Returns 'QPointArray'
+      return KJS::Value(); // Returns 'TQPointArray'
 
 }
 
-KJS::Value QCanvasSplineImp::closed_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSplineImp::closed_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -209,7 +209,7 @@ KJS::Value QCanvasSplineImp::closed_5( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QCanvasSplineImp::rtti_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSplineImp::rtti_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
diff --git a/kjsembed/qtbindings/qcanvasspline_imp.h b/kjsembed/qtbindings/qcanvasspline_imp.h
index 73f87999..be3a29ea 100644
--- a/kjsembed/qtbindings/qcanvasspline_imp.h
+++ b/kjsembed/qtbindings/qcanvasspline_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasSpline;
+class TTQCanvasSpline;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasSpline;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasSpline methods.
+ * Wrapper class for TTQCanvasSpline methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasSplineImp : public JSProxyImp
+class TQCanvasSplineImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -41,8 +41,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasSplineImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasSplineImp();
+   TQCanvasSplineImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasSplineImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -56,13 +56,13 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasSpline *toQCanvasSpline( KJS::Object &object );
+   static TTQCanvasSpline *toTQCanvasSpline( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvasSpline_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasSpline_1( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -90,7 +90,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvasSpline *instance; // Temp
+   TTQCanvasSpline *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvassprite_imp.cpp b/kjsembed/qtbindings/qcanvassprite_imp.cpp
index 7d9898b3..d4c8dc23 100644
--- a/kjsembed/qtbindings/qcanvassprite_imp.cpp
+++ b/kjsembed/qtbindings/qcanvassprite_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasSpriteImp::QCanvasSpriteImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasSpriteImp::TQCanvasSpriteImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasSpriteImp::~QCanvasSpriteImp()
+TTQCanvasSpriteImp::~TQCanvasSpriteImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasSpriteImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasSpriteImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasSpriteImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasSpriteImp *meth = new QCanvasSpriteImp( exec, methods[idx].id );
+            TQCanvasSpriteImp *meth = new TQCanvasSpriteImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -66,8 +66,8 @@ void QCanvasSpriteImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
     EnumValue enums[] = {
 
         // enum FrameAnimationType
-        { "Cycle", TQCanvasSprite::Cycle },
-        { "Oscillate", TQCanvasSprite::Oscillate },
+        { "Cycle", TTQCanvasSprite::Cycle },
+        { "Oscillate", TTQCanvasSprite::Oscillate },
 	{ 0, 0 }
     };
 
@@ -82,7 +82,7 @@ void QCanvasSpriteImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasSpriteImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasSpriteImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -115,11 +115,11 @@ void QCanvasSpriteImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasSpriteImp *meth = new QCanvasSpriteImp( exec, methods[idx].id );
+            TQCanvasSpriteImp *meth = new TQCanvasSpriteImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -128,64 +128,64 @@ void QCanvasSpriteImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQCanvasSprite pointer from an Object.
+ * Extract a TTQCanvasSprite pointer from an Object.
  */
-TQCanvasSprite *QCanvasSpriteImp::toQCanvasSprite( KJS::Object &self )
+TTQCanvasSprite *TQCanvasSpriteImp::toTQCanvasSprite( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasSprite *>( obj );
+           return dynamic_cast<TTQCanvasSprite *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvasSprite" )
+    if ( op->typeName() != "TTQCanvasSprite" )
         return 0;
 
-    return op->toNative<TQCanvasSprite>();
+    return op->toNative<TTQCanvasSprite>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasSpriteImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasSpriteImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvasSprite_1:
-             return QCanvasSprite_1( exec, args );
+             return TQCanvasSprite_1( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasSpriteCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasSpriteCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasSpriteImp::QCanvasSprite_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasSpriteImp::TQCanvasSprite_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasPixmapArray *
+    // Unsupported parameter TTQCanvasPixmapArray *
     return KJS::Object();
 
-    TQCanvasPixmapArray * arg0; // Dummy
+    TTQCanvasPixmapArray * arg0; // Dummy
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg1; // Dummy
+    TTQCanvas * arg1; // Dummy
 
 
-    // We should now create an instance of the TQCanvasSprite object
+    // We should now create an instance of the TTQCanvasSprite object
 
-    TQCanvasSprite *ret = new TQCanvasSprite(
+    TTQCanvasSprite *ret = new TTQCanvasSprite(
 
           arg0,
           arg1 );
@@ -193,9 +193,9 @@ KJS::Object QCanvasSpriteImp::QCanvasSprite_1( KJS::ExecState *exec, const KJS::
 
 }
 
-KJS::Value QCanvasSpriteImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasSpriteImp::toQCanvasSprite( self );
+    instance = TQCanvasSpriteImp::toTQCanvasSprite( self );
 
     switch( id ) {
 
@@ -303,18 +303,18 @@ KJS::Value QCanvasSpriteImp::call( KJS::ExecState *exec, KJS::Object &self, cons
         break;
     }
 
-    TQString msg = i18n( "QCanvasSpriteImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasSpriteImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasSpriteImp::setSequence_2( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::setSequence_2( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvasPixmapArray *
+    // Unsupported parameter TTQCanvasPixmapArray *
     return KJS::Value();
 
-    TQCanvasPixmapArray * arg0; // Dummy
+    TTQCanvasPixmapArray * arg0; // Dummy
 
       instance->setSequence(
        arg0 );
@@ -322,7 +322,7 @@ KJS::Value QCanvasSpriteImp::setSequence_2( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QCanvasSpriteImp::move_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::move_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
@@ -336,7 +336,7 @@ KJS::Value QCanvasSpriteImp::move_4( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QCanvasSpriteImp::move_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::move_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
@@ -353,7 +353,7 @@ KJS::Value QCanvasSpriteImp::move_5( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QCanvasSpriteImp::setFrame_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::setFrame_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -364,10 +364,10 @@ KJS::Value QCanvasSpriteImp::setFrame_6( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasSpriteImp::setFrameAnimation_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::setFrameAnimation_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQCanvasSprite::FrameAnimationType arg0 = TQCanvasSprite::Cycle; // TODO (hack for TQCanvasSprite)
+    TTQCanvasSprite::FrameAnimationType arg0 = TTQCanvasSprite::Cycle; // TODO (hack for TTQCanvasSprite)
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -381,7 +381,7 @@ KJS::Value QCanvasSpriteImp::setFrameAnimation_7( KJS::ExecState *exec, KJS::Obj
 
 }
 
-KJS::Value QCanvasSpriteImp::frame_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::frame_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -390,7 +390,7 @@ KJS::Value QCanvasSpriteImp::frame_8( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QCanvasSpriteImp::frameCount_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::frameCount_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -399,7 +399,7 @@ KJS::Value QCanvasSpriteImp::frameCount_9( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasSpriteImp::rtti_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::rtti_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -408,13 +408,13 @@ KJS::Value QCanvasSpriteImp::rtti_10( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QCanvasSpriteImp::collidesWith_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::collidesWith_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQCanvasItem *
+    // Unsupported parameter const TTQCanvasItem *
     return KJS::Value();
 
-    const TQCanvasItem * arg0; // Dummy
+    const TTQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
@@ -423,16 +423,16 @@ KJS::Value QCanvasSpriteImp::collidesWith_11( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QCanvasSpriteImp::boundingRect_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::boundingRect_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQRect ret;
+    TTQRect ret;
       ret = instance->boundingRect(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasSpriteImp::width_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::width_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -441,7 +441,7 @@ KJS::Value QCanvasSpriteImp::width_13( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QCanvasSpriteImp::height_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::height_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -450,7 +450,7 @@ KJS::Value QCanvasSpriteImp::height_14( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasSpriteImp::leftEdge_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::leftEdge_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -459,7 +459,7 @@ KJS::Value QCanvasSpriteImp::leftEdge_15( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QCanvasSpriteImp::topEdge_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::topEdge_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -468,7 +468,7 @@ KJS::Value QCanvasSpriteImp::topEdge_16( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasSpriteImp::rightEdge_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::rightEdge_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -477,7 +477,7 @@ KJS::Value QCanvasSpriteImp::rightEdge_17( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasSpriteImp::bottomEdge_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::bottomEdge_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -486,7 +486,7 @@ KJS::Value QCanvasSpriteImp::bottomEdge_18( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QCanvasSpriteImp::leftEdge_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::leftEdge_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -498,7 +498,7 @@ KJS::Value QCanvasSpriteImp::leftEdge_19( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QCanvasSpriteImp::topEdge_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::topEdge_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -510,7 +510,7 @@ KJS::Value QCanvasSpriteImp::topEdge_20( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasSpriteImp::rightEdge_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::rightEdge_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -522,7 +522,7 @@ KJS::Value QCanvasSpriteImp::rightEdge_21( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QCanvasSpriteImp::bottomEdge_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::bottomEdge_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -534,34 +534,34 @@ KJS::Value QCanvasSpriteImp::bottomEdge_22( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QCanvasSpriteImp::image_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::image_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->image(  );
-      return KJS::Value(); // Returns 'TQCanvasPixmap *'
+      return KJS::Value(); // Returns 'TTQCanvasPixmap *'
 
 }
 
-KJS::Value QCanvasSpriteImp::imageAdvanced_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::imageAdvanced_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->imageAdvanced(  );
-      return KJS::Value(); // Returns 'TQCanvasPixmap *'
+      return KJS::Value(); // Returns 'TTQCanvasPixmap *'
 
 }
 
-KJS::Value QCanvasSpriteImp::image_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::image_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
       instance->image(
        arg0 );
-      return KJS::Value(); // Returns 'TQCanvasPixmap *'
+      return KJS::Value(); // Returns 'TTQCanvasPixmap *'
 
 }
 
-KJS::Value QCanvasSpriteImp::advance_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::advance_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -572,10 +572,10 @@ KJS::Value QCanvasSpriteImp::advance_26( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasSpriteImp::draw_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasSpriteImp::draw_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPainter arg0; // TODO (hack for qcanvas)
+    TTQPainter arg0; // TODO (hack for qcanvas)
 
       instance->draw(
        arg0 );
diff --git a/kjsembed/qtbindings/qcanvassprite_imp.h b/kjsembed/qtbindings/qcanvassprite_imp.h
index 4fe40dc1..969cd9cf 100644
--- a/kjsembed/qtbindings/qcanvassprite_imp.h
+++ b/kjsembed/qtbindings/qcanvassprite_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasSprite;
+class TTQCanvasSprite;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasSprite;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasSprite methods.
+ * Wrapper class for TTQCanvasSprite methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasSpriteImp : public JSProxyImp
+class TQCanvasSpriteImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -62,8 +62,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasSpriteImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasSpriteImp();
+   TQCanvasSpriteImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasSpriteImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -77,13 +77,13 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasSprite *toQCanvasSprite( KJS::Object &object );
+   static TTQCanvasSprite *toTQCanvasSprite( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvasSprite_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasSprite_1( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -132,7 +132,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvasSprite *instance; // Temp
+   TTQCanvasSprite *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvastext_imp.cpp b/kjsembed/qtbindings/qcanvastext_imp.cpp
index 44db9795..bb1c00ce 100644
--- a/kjsembed/qtbindings/qcanvastext_imp.cpp
+++ b/kjsembed/qtbindings/qcanvastext_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasTextImp::QCanvasTextImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasTextImp::TQCanvasTextImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasTextImp::~QCanvasTextImp()
+TTQCanvasTextImp::~TQCanvasTextImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasTextImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasTextImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasTextImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasTextImp *meth = new QCanvasTextImp( exec, methods[idx].id );
+            TQCanvasTextImp *meth = new TQCanvasTextImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QCanvasTextImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasTextImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasTextImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -80,11 +80,11 @@ void QCanvasTextImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasTextImp *meth = new QCanvasTextImp( exec, methods[idx].id );
+            TQCanvasTextImp *meth = new TQCanvasTextImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -93,87 +93,87 @@ void QCanvasTextImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQCanvasText pointer from an Object.
+ * Extract a TTQCanvasText pointer from an Object.
  */
-TQCanvasText *QCanvasTextImp::toQCanvasText( KJS::Object &self )
+TTQCanvasText *TQCanvasTextImp::toTQCanvasText( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasText *>( obj );
+           return dynamic_cast<TTQCanvasText *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvasText" )
+    if ( op->typeName() != "TTQCanvasText" )
         return 0;
 
-    return op->toNative<TQCanvasText>();
+    return op->toNative<TTQCanvasText>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasTextImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasTextImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvasText_1:
-             return QCanvasText_1( exec, args );
+             return TQCanvasText_1( exec, args );
              break;
 
          case Constructor_QCanvasText_2:
-             return QCanvasText_2( exec, args );
+             return TQCanvasText_2( exec, args );
              break;
 
          case Constructor_QCanvasText_3:
-             return QCanvasText_3( exec, args );
+             return TQCanvasText_3( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasTextCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasTextCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasTextImp::QCanvasText_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasTextImp::TQCanvasText_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg0; // Dummy
+    TTQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TQCanvasText object
+    // We should now create an instance of the TTQCanvasText object
 
-    TQCanvasText *ret = new TQCanvasText(
+    TTQCanvasText *ret = new TTQCanvasText(
 
           arg0 );
 
 
 }
 
-KJS::Object QCanvasTextImp::QCanvasText_2( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasTextImp::TQCanvasText_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg1; // Dummy
+    TTQCanvas * arg1; // Dummy
 
 
-    // We should now create an instance of the TQCanvasText object
+    // We should now create an instance of the TTQCanvasText object
 
-    TQCanvasText *ret = new TQCanvasText(
+    TTQCanvasText *ret = new TTQCanvasText(
 
           arg0,
           arg1 );
@@ -181,25 +181,25 @@ KJS::Object QCanvasTextImp::QCanvasText_2( KJS::ExecState *exec, const KJS::List
 
 }
 
-KJS::Object QCanvasTextImp::QCanvasText_3( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasTextImp::TQCanvasText_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
-    // Unsupported parameter QFont
+    // Unsupported parameter TQFont
     return KJS::Object();
 
-    TQFont arg1; // Dummy
+    TTQFont arg1; // Dummy
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Object();
 
-    TQCanvas * arg2; // Dummy
+    TTQCanvas * arg2; // Dummy
 
 
-    // We should now create an instance of the TQCanvasText object
+    // We should now create an instance of the TTQCanvasText object
 
-    TQCanvasText *ret = new TQCanvasText(
+    TTQCanvasText *ret = new TTQCanvasText(
 
           arg0,
           arg1,
@@ -208,9 +208,9 @@ KJS::Object QCanvasTextImp::QCanvasText_3( KJS::ExecState *exec, const KJS::List
 
 }
 
-KJS::Value QCanvasTextImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasTextImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasTextImp::toQCanvasText( self );
+    instance = TQCanvasTextImp::toTQCanvasText( self );
 
     switch( id ) {
 
@@ -266,15 +266,15 @@ KJS::Value QCanvasTextImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    TQString msg = i18n( "QCanvasTextImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasTextImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasTextImp::setText_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasTextImp::setText_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
       instance->setText(
        arg0 );
@@ -282,10 +282,10 @@ KJS::Value QCanvasTextImp::setText_5( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QCanvasTextImp::setFont_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasTextImp::setFont_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQFont arg0 = extractQFont(exec, args, 0);
+    TTQFont arg0 = extractTQFont(exec, args, 0);
 
       instance->setFont(
        arg0 );
@@ -293,10 +293,10 @@ KJS::Value QCanvasTextImp::setFont_6( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QCanvasTextImp::setColor_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasTextImp::setColor_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQColor arg0 = extractQColor(exec, args, 0);
+    TTQColor arg0 = extractTQColor(exec, args, 0);
 
       instance->setColor(
        arg0 );
@@ -304,32 +304,32 @@ KJS::Value QCanvasTextImp::setColor_7( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QCanvasTextImp::text_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasTextImp::text_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->text(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QCanvasTextImp::font_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasTextImp::font_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->font(  );
-      return KJS::Value(); // Returns 'QFont'
+      return KJS::Value(); // Returns 'TQFont'
 
 }
 
-KJS::Value QCanvasTextImp::color_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasTextImp::color_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->color(  );
-      return KJS::Value(); // Returns 'QColor'
+      return KJS::Value(); // Returns 'TQColor'
 
 }
 
-KJS::Value QCanvasTextImp::moveBy_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasTextImp::moveBy_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     double arg0 = extractDouble(exec, args, 0);
@@ -343,7 +343,7 @@ KJS::Value QCanvasTextImp::moveBy_11( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QCanvasTextImp::textFlags_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasTextImp::textFlags_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -352,7 +352,7 @@ KJS::Value QCanvasTextImp::textFlags_12( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasTextImp::setTextFlags_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasTextImp::setTextFlags_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -363,22 +363,22 @@ KJS::Value QCanvasTextImp::setTextFlags_13( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QCanvasTextImp::boundingRect_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasTextImp::boundingRect_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQRect ret;
+    TTQRect ret;
       ret = instance->boundingRect(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QCanvasTextImp::collidesWith_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasTextImp::collidesWith_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQCanvasItem *
+    // Unsupported parameter const TTQCanvasItem *
     return KJS::Value();
 
-    const TQCanvasItem * arg0; // Dummy
+    const TTQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
@@ -387,7 +387,7 @@ KJS::Value QCanvasTextImp::collidesWith_15( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QCanvasTextImp::rtti_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasTextImp::rtti_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
diff --git a/kjsembed/qtbindings/qcanvastext_imp.h b/kjsembed/qtbindings/qcanvastext_imp.h
index 11f50a51..e4e40590 100644
--- a/kjsembed/qtbindings/qcanvastext_imp.h
+++ b/kjsembed/qtbindings/qcanvastext_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasText;
+class TTQCanvasText;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasText;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasText methods.
+ * Wrapper class for TTQCanvasText methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasTextImp : public JSProxyImp
+class TQCanvasTextImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -51,8 +51,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasTextImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasTextImp();
+   TQCanvasTextImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasTextImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -66,15 +66,15 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasText *toQCanvasText( KJS::Object &object );
+   static TTQCanvasText *toTQCanvasText( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvasText_1( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvasText_2( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvasText_3( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasText_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasText_2( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasText_3( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -110,7 +110,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvasText *instance; // Temp
+   TTQCanvasText *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasview_imp.cpp b/kjsembed/qtbindings/qcanvasview_imp.cpp
index bf190920..bfa3229b 100644
--- a/kjsembed/qtbindings/qcanvasview_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasview_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QCanvasViewImp::QCanvasViewImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCanvasViewImp::TQCanvasViewImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCanvasViewImp::~QCanvasViewImp()
+TTQCanvasViewImp::~TQCanvasViewImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QCanvasViewImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasViewImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QCanvasViewImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasViewImp *meth = new QCanvasViewImp( exec, methods[idx].id );
+            TQCanvasViewImp *meth = new TQCanvasViewImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QCanvasViewImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QCanvasViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCanvasViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -73,11 +73,11 @@ void QCanvasViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QCanvasViewImp *meth = new QCanvasViewImp( exec, methods[idx].id );
+            TQCanvasViewImp *meth = new TQCanvasViewImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -86,104 +86,104 @@ void QCanvasViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQCanvasView pointer from an Object.
+ * Extract a TTQCanvasView pointer from an Object.
  */
-TQCanvasView *QCanvasViewImp::toQCanvasView( KJS::Object &self )
+TTQCanvasView *TQCanvasViewImp::toTQCanvasView( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCanvasView *>( obj );
+           return dynamic_cast<TTQCanvasView *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQCanvasView" )
+    if ( op->typeName() != "TTQCanvasView" )
         return 0;
 
-    return op->toNative<TQCanvasView>();
+    return op->toNative<TTQCanvasView>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QCanvasViewImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasViewImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCanvasView_1:
-             return QCanvasView_1( exec, args );
+             return TQCanvasView_1( exec, args );
              break;
 
          case Constructor_QCanvasView_2:
-             return QCanvasView_2( exec, args );
+             return TQCanvasView_2( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCanvasViewCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCanvasViewCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCanvasViewImp::QCanvasView_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasViewImp::TQCanvasView_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TQWidget *arg0 = extractQWidget(exec, args, 0);
+    TTQWidget *arg0 = extractTQWidget(exec, args, 0);
 
 
     const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0;
 
-    Qt::WFlags arg2 = 0; // TODO (hack for TQCanvasView)
+    TQt::WFlags arg2 = 0; // TODO (hack for TTQCanvasView)
 
 
-    // We should now create an instance of the TQCanvasView object
+    // We should now create an instance of the TTQCanvasView object
 
-    TQCanvasView *ret = new TQCanvasView(
+    TTQCanvasView *ret = new TTQCanvasView(
 
           arg0,
           arg1,
           arg2 );
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvasView");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TTQCanvasView");
     return KJS::Object( prx );
 }
 
-KJS::Object QCanvasViewImp::QCanvasView_2( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCanvasViewImp::TQCanvasView_2( KJS::ExecState *exec, const KJS::List &args )
 {
-    TQCanvas * arg0 = 0L;;
+    TTQCanvas * arg0 = 0L;;
 
     KJS::Object obj = args[0].toObject(exec);
     JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() );
-    if ( proxy ) arg0 = dynamic_cast<TQCanvas *>( proxy->widget() );
+    if ( proxy ) arg0 = dynamic_cast<TTQCanvas *>( proxy->widget() );
 
-    TQWidget * arg1 = extractQWidget(exec, args, 1);
+    TTQWidget * arg1 = extractTQWidget(exec, args, 1);
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
-    Qt::WFlags arg3 = 0; // TODO (hack for TQCanvasView)
+    TQt::WFlags arg3 = 0; // TODO (hack for TTQCanvasView)
 
 
-    // We should now create an instance of the TQCanvasView object
+    // We should now create an instance of the TTQCanvasView object
 
-    TQCanvasView *ret = new TQCanvasView(
+    TTQCanvasView *ret = new TTQCanvasView(
           arg0,
           arg1,
           arg2,
           arg3 );
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvasView");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TTQCanvasView");
     return KJS::Object( prx );
 }
 
-KJS::Value QCanvasViewImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCanvasViewImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCanvasViewImp::toQCanvasView( self );
+    instance = TQCanvasViewImp::toTQCanvasView( self );
 
     switch( id ) {
 
@@ -211,26 +211,26 @@ KJS::Value QCanvasViewImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    TQString msg = i18n( "QCanvasViewImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCanvasViewImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCanvasViewImp::canvas_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasViewImp::canvas_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->canvas(  );
-      return KJS::Value(); // Returns 'TQCanvas *'
+      return KJS::Value(); // Returns 'TTQCanvas *'
 
 }
 
-KJS::Value QCanvasViewImp::setCanvas_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasViewImp::setCanvas_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCanvas *
+    // Unsupported parameter TTQCanvas *
     return KJS::Value();
 
-    TQCanvas * arg0; // Dummy
+    TTQCanvas * arg0; // Dummy
 
       instance->setCanvas(
        arg0 );
@@ -238,26 +238,26 @@ KJS::Value QCanvasViewImp::setCanvas_5( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCanvasViewImp::worldMatrix_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasViewImp::worldMatrix_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->worldMatrix(  );
-      return KJS::Value(); // Returns 'const TQWMatrix &'
+      return KJS::Value(); // Returns 'const TTQWMatrix &'
 
 }
 
-KJS::Value QCanvasViewImp::inverseWorldMatrix_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasViewImp::inverseWorldMatrix_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->inverseWorldMatrix(  );
-      return KJS::Value(); // Returns 'const TQWMatrix &'
+      return KJS::Value(); // Returns 'const TTQWMatrix &'
 
 }
 
-KJS::Value QCanvasViewImp::setWorldMatrix_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCanvasViewImp::setWorldMatrix_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQWMatrix arg0; // TODO (hack for qcanvasview)
+    TTQWMatrix 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 24322716..01a8b1e6 100644
--- a/kjsembed/qtbindings/qcanvasview_imp.h
+++ b/kjsembed/qtbindings/qcanvasview_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQCanvasView;
+class TTQCanvasView;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQCanvasView;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQCanvasView methods.
+ * Wrapper class for TTQCanvasView methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCanvasViewImp : public JSProxyImp
+class TQCanvasViewImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -43,8 +43,8 @@ public:
        Method_Last = -1
    };
 
-   QCanvasViewImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCanvasViewImp();
+   TQCanvasViewImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCanvasViewImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -58,14 +58,14 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCanvasView *toQCanvasView( KJS::Object &object );
+   static TTQCanvasView *toTQCanvasView( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCanvasView_1( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCanvasView_2( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasView_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCanvasView_2( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -94,7 +94,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCanvasView *instance; // Temp
+   TTQCanvasView *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qchecklistitem_imp.cpp b/kjsembed/qtbindings/qchecklistitem_imp.cpp
index 508861f5..7fe6d673 100644
--- a/kjsembed/qtbindings/qchecklistitem_imp.cpp
+++ b/kjsembed/qtbindings/qchecklistitem_imp.cpp
@@ -22,27 +22,27 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-    KJS::Object QCheckListItemLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const
+    KJS::Object TQCheckListItemLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const
     {
         if ( args.size() == 0 ) {
                         // FALL THRU
         } else {
             JSOpaqueProxy * arg0 = JSProxy::toOpaqueProxy( args[ 0 ].imp() );
-            TQString arg1 = ( args.size() >= 2 ) ? args[ 1 ].toString( exec ).qstring() : TQString::null;
+            TTQString arg1 = ( args.size() >= 2 ) ? args[ 1 ].toString( exec ).qstring() : TTQString::null;
             JSOpaqueProxy *prx = 0;
 
             if ( arg0 ) {
-                if ( arg0->typeName() == "TQListViewItem" ) {
-                    TQListViewItem * parent = arg0->toNative<TQListViewItem>();
-                    prx = new JSOpaqueProxy( new TQCheckListItem( parent, arg1 ), "TQCheckListItem" );
+                if ( arg0->typeName() == "TTQListViewItem" ) {
+                    TTQListViewItem * parent = arg0->toNative<TTQListViewItem>();
+                    prx = new JSOpaqueProxy( new TTQCheckListItem( parent, arg1 ), "TTQCheckListItem" );
                 } else {
                     return KJS::Object();
                 }
             } else {
                 JSObjectProxy *arg0 = JSProxy::toObjectProxy( args[ 0 ].imp() );
                 if ( arg0 ) {
-                    TQListView * parent = ( TQListView * ) ( arg0->widget() );
-                    prx = new JSOpaqueProxy( new TQCheckListItem( parent, arg1 ), "TQCheckListItem" );
+                    TTQListView * parent = ( TTQListView * ) ( arg0->widget() );
+                    prx = new JSOpaqueProxy( new TTQCheckListItem( parent, arg1 ), "TTQCheckListItem" );
                 } else {
                     return KJS::Object();
                 }
@@ -54,23 +54,23 @@ namespace Bindings {
         }
         return KJS::Object();
     }
-    void QCheckListItemLoader::addBindings( KJSEmbedPart *jspart, KJS::ExecState *exec, KJS::Object &proxy ) const
+    void TQCheckListItemLoader::addBindings( KJSEmbedPart *jspart, KJS::ExecState *exec, KJS::Object &proxy ) const
     {
-        QListViewItemImp::addBindings( exec, proxy );
-        QCheckListItemImp::addBindings( exec, proxy );
+        TQListViewItemImp::addBindings( exec, proxy );
+        TQCheckListItemImp::addBindings( exec, proxy );
     }
 
 }
-QCheckListItemImp::QCheckListItemImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQCheckListItemImp::TQCheckListItemImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QCheckListItemImp::~QCheckListItemImp()
+TTQCheckListItemImp::~TQCheckListItemImp()
 {
 }
 
-void QCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -92,11 +92,11 @@ void QCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].id ) {
         if ( lastName != methods[idx].name ) {
-            QCheckListItemImp *meth = new QCheckListItemImp( exec, methods[idx].id );
+            TQCheckListItemImp *meth = new TQCheckListItemImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -115,15 +115,15 @@ void QCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     EnumValue enums[] = {
 
         // enum Type
-        { "RadioButton", TQCheckListItem::RadioButton },
-        { "CheckBox", TQCheckListItem::CheckBox },
-        { "Controller", TQCheckListItem::Controller },
-        { "RadioButtonController", TQCheckListItem::RadioButtonController },
-        { "CheckBoxController", TQCheckListItem::CheckBoxController },
+        { "RadioButton", TTQCheckListItem::RadioButton },
+        { "CheckBox", TTQCheckListItem::CheckBox },
+        { "Controller", TTQCheckListItem::Controller },
+        { "RadioButtonController", TTQCheckListItem::RadioButtonController },
+        { "CheckBoxController", TTQCheckListItem::CheckBoxController },
         // enum ToggleState
-        { "Off", TQCheckListItem::Off },
-        { "NoChange", TQCheckListItem::NoChange },
-        { "On", TQCheckListItem::On },
+        { "Off", TTQCheckListItem::Off },
+        { "NoChange", TTQCheckListItem::NoChange },
+        { "On", TTQCheckListItem::On },
 	{ 0, 0 }
     };
 
@@ -135,196 +135,196 @@ void QCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 
 }
 
-TQCheckListItem *QCheckListItemImp::toQCheckListItem( KJS::Object &self )
+TTQCheckListItem *TQCheckListItemImp::toTQCheckListItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQCheckListItem *>( obj );
+           return dynamic_cast<TTQCheckListItem *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
-    return op->toNative<TQCheckListItem>();
+    return op->toNative<TTQCheckListItem>();
 }
 
 
-KJS::Object QCheckListItemImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCheckListItemImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QCheckListItem_1:
-             return QCheckListItem_1( exec, args );
+             return TQCheckListItem_1( exec, args );
              break;
 
          case Constructor_QCheckListItem_2:
-             return QCheckListItem_2( exec, args );
+             return TQCheckListItem_2( exec, args );
              break;
 
          case Constructor_QCheckListItem_3:
-             return QCheckListItem_3( exec, args );
+             return TQCheckListItem_3( exec, args );
              break;
 
          case Constructor_QCheckListItem_4:
-             return QCheckListItem_4( exec, args );
+             return TQCheckListItem_4( exec, args );
              break;
 
          case Constructor_QCheckListItem_5:
-             return QCheckListItem_5( exec, args );
+             return TQCheckListItem_5( exec, args );
              break;
 
          case Constructor_QCheckListItem_6:
-             return QCheckListItem_6( exec, args );
+             return TQCheckListItem_6( exec, args );
              break;
 
          case Constructor_QCheckListItem_7:
-             return QCheckListItem_7( exec, args );
+             return TQCheckListItem_7( exec, args );
              break;
 
          case Constructor_QCheckListItem_8:
-             return QCheckListItem_8( exec, args );
+             return TQCheckListItem_8( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QCheckListItemCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQCheckListItemCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QCheckListItemImp::QCheckListItem_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCheckListItemImp::TQCheckListItem_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TQWidget *arg0 = extractQWidget(exec,args,0);
+    TTQWidget *arg0 = extractTQWidget(exec,args,0);
 
-    TQWidget *arg1 = extractQWidget(exec,args,1);
+    TTQWidget *arg1 = extractTQWidget(exec,args,1);
 
-    TQWidget *arg2 = extractQWidget(exec,args,2);
+    TTQWidget *arg2 = extractTQWidget(exec,args,2);
 
     return KJS::Object(  );
 }
 
-KJS::Object QCheckListItemImp::QCheckListItem_2( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCheckListItemImp::TQCheckListItem_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
     // TODO
-    TQWidget *arg0 = extractQWidget(exec,args,0);
+    TTQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg1 = extractQWidget(exec,args,0);
+    TTQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg2 = extractQWidget(exec,args,0);
+    TTQWidget *arg2 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg3 = extractQWidget(exec,args,0);
+    TTQWidget *arg3 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
 
-KJS::Object QCheckListItemImp::QCheckListItem_3( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCheckListItemImp::TQCheckListItem_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
     // TODO
-    TQWidget *arg0 = extractQWidget(exec,args,0);
+    TTQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg1 = extractQWidget(exec,args,0);
+    TTQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg2 = extractQWidget(exec,args,0);
+    TTQWidget *arg2 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
 
-KJS::Object QCheckListItemImp::QCheckListItem_4( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCheckListItemImp::TQCheckListItem_4( KJS::ExecState *exec, const KJS::List &args )
 {
 
     // TODO
-    TQWidget *arg0 = extractQWidget(exec,args,0);
+    TTQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg1 = extractQWidget(exec,args,0);
+    TTQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg2 = extractQWidget(exec,args,0);
+    TTQWidget *arg2 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg3 = extractQWidget(exec,args,0);
+    TTQWidget *arg3 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
 
-KJS::Object QCheckListItemImp::QCheckListItem_5( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCheckListItemImp::TQCheckListItem_5( KJS::ExecState *exec, const KJS::List &args )
 {
 
     // TODO
-    TQWidget *arg0 = extractQWidget(exec,args,0);
+    TTQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg1 = extractQWidget(exec,args,0);
+    TTQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg2 = extractQWidget(exec,args,0);
+    TTQWidget *arg2 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
 
-KJS::Object QCheckListItemImp::QCheckListItem_6( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCheckListItemImp::TQCheckListItem_6( KJS::ExecState *exec, const KJS::List &args )
 {
 
     // TODO
-    TQWidget *arg0 = extractQWidget(exec,args,0);
+    TTQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg1 = extractQWidget(exec,args,0);
+    TTQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg2 = extractQWidget(exec,args,0);
+    TTQWidget *arg2 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg3 = extractQWidget(exec,args,0);
+    TTQWidget *arg3 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
 
-KJS::Object QCheckListItemImp::QCheckListItem_7( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCheckListItemImp::TQCheckListItem_7( KJS::ExecState *exec, const KJS::List &args )
 {
 
     // TODO
-    TQWidget *arg0 = extractQWidget(exec,args,0);
+    TTQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg1 = extractQWidget(exec,args,0);
+    TTQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg2 = extractQWidget(exec,args,0);
+    TTQWidget *arg2 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
 
-KJS::Object QCheckListItemImp::QCheckListItem_8( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQCheckListItemImp::TQCheckListItem_8( KJS::ExecState *exec, const KJS::List &args )
 {
 
     // TODO
-    TQWidget *arg0 = extractQWidget(exec,args,0);
+    TTQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg1 = extractQWidget(exec,args,0);
+    TTQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TQWidget *arg2 = extractQWidget(exec,args,0);
+    TTQWidget *arg2 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
 
-KJS::Value QCheckListItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQCheckListItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QCheckListItemImp::toQCheckListItem( self );
+    instance = TQCheckListItemImp::toTQCheckListItem( self );
 
     switch( id ) {
 
@@ -388,23 +388,23 @@ KJS::Value QCheckListItemImp::call( KJS::ExecState *exec, KJS::Object &self, con
         break;
     }
 
-    TQString msg = i18n( "QCheckListItemImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQCheckListItemImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QCheckListItemImp::paintCell_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::paintCell_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQPainter *
+    // Unsupported parameter TTQPainter *
     return KJS::Value();
 
-    TQPainter * arg0; // Dummy
+    TTQPainter * arg0; // Dummy
 
-    // Unsupported parameter const TQColorGroup &
+    // Unsupported parameter const TTQColorGroup &
     return KJS::Value();
 #if 0
-    const TQColorGroup & arg1; // Dummy
+    const TTQColorGroup & arg1; // Dummy
 
     int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1;
 
@@ -422,20 +422,20 @@ KJS::Value QCheckListItemImp::paintCell_10( KJS::ExecState *exec, KJS::Object &o
 #endif
 }
 
-KJS::Value QCheckListItemImp::paintFocus_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::paintFocus_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQPainter *
+    // Unsupported parameter TTQPainter *
     return KJS::Value();
 #if 0
-    TQPainter * arg0; // Dummy
+    TTQPainter * arg0; // Dummy
 
-    // Unsupported parameter const TQColorGroup &
+    // Unsupported parameter const TTQColorGroup &
     return KJS::Value();
 
-    const TQColorGroup & arg1; // Dummy
+    const TTQColorGroup & arg1; // Dummy
 
-    TQRect arg2 = extractQRect(exec, args, 2);
+    TTQRect arg2 = extractTQRect(exec, args, 2);
 
       instance->paintFocus(
        arg0,
@@ -445,18 +445,18 @@ KJS::Value QCheckListItemImp::paintFocus_11( KJS::ExecState *exec, KJS::Object &
 #endif
 }
 
-KJS::Value QCheckListItemImp::width_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::width_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQFontMetrics &
+    // Unsupported parameter const TTQFontMetrics &
     return KJS::Value();
 #if 0
-    const TQFontMetrics & arg0; // Dummy
+    const TTQFontMetrics & arg0; // Dummy
 
-    // Unsupported parameter const TQListView *
+    // Unsupported parameter const TTQListView *
     return KJS::Value();
 
-    const TQListView * arg1; // Dummy
+    const TTQListView * arg1; // Dummy
 
     int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1;
 
@@ -469,7 +469,7 @@ KJS::Value QCheckListItemImp::width_12( KJS::ExecState *exec, KJS::Object &obj,
 #endif
 }
 
-KJS::Value QCheckListItemImp::setup_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::setup_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->setup(  );
@@ -477,7 +477,7 @@ KJS::Value QCheckListItemImp::setup_13( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCheckListItemImp::setOn_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::setOn_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = (args.size() >= 1) ? args[0].toBoolean(exec) : false;
@@ -488,7 +488,7 @@ KJS::Value QCheckListItemImp::setOn_14( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCheckListItemImp::isOn_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::isOn_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -497,7 +497,7 @@ KJS::Value QCheckListItemImp::isOn_15( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QCheckListItemImp::type_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::type_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->type(  );
@@ -505,28 +505,28 @@ KJS::Value QCheckListItemImp::type_16( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QCheckListItemImp::text_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::text_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->text(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QCheckListItemImp::text_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::text_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
 
-      TQString ret;
+      TTQString ret;
       ret = instance->text(
        arg0 );
       return KJS::String( ret );
 
 }
 
-KJS::Value QCheckListItemImp::setTristate_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::setTristate_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = (args.size() >= 1) ? args[0].toBoolean(exec) : false;
@@ -537,7 +537,7 @@ KJS::Value QCheckListItemImp::setTristate_19( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QCheckListItemImp::isTristate_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::isTristate_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -546,7 +546,7 @@ KJS::Value QCheckListItemImp::isTristate_20( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QCheckListItemImp::state_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::state_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->state(  );
@@ -554,7 +554,7 @@ KJS::Value QCheckListItemImp::state_21( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QCheckListItemImp::setState_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::setState_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     // Unsupported parameter ToggleState
@@ -568,7 +568,7 @@ KJS::Value QCheckListItemImp::setState_22( KJS::ExecState *exec, KJS::Object &ob
 #endif
 }
 
-KJS::Value QCheckListItemImp::rtti_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQCheckListItemImp::rtti_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
diff --git a/kjsembed/qtbindings/qchecklistitem_imp.h b/kjsembed/qtbindings/qchecklistitem_imp.h
index 4ba46d32..a24c316f 100644
--- a/kjsembed/qtbindings/qchecklistitem_imp.h
+++ b/kjsembed/qtbindings/qchecklistitem_imp.h
@@ -10,7 +10,7 @@
 #include <kjsembed/jsobjectproxy_imp.h>
 #include <kjsembed/jsbindingbase.h>
 
-class TQCheckListItem;
+class TTQCheckListItem;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -18,7 +18,7 @@ class TQCheckListItem;
 namespace KJSEmbed {
 namespace Bindings {
 
-    class QCheckListItemLoader : public JSBindingBase
+    class TQCheckListItemLoader : public JSBindingBase
     {
         public:
             KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const;
@@ -26,11 +26,11 @@ namespace Bindings {
     };
 }
 /**
- * Wrapper class for TQCheckListItem methods.
+ * Wrapper class for TTQCheckListItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QCheckListItemImp : public JSProxyImp
+class TQCheckListItemImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -67,25 +67,25 @@ public:
        Method_Last = -1
    };
 
-   QCheckListItemImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QCheckListItemImp();
+   TQCheckListItemImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQCheckListItemImp();
 
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQCheckListItem *toQCheckListItem( KJS::Object &object );
+   static TTQCheckListItem *toTQCheckListItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QCheckListItem_1( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCheckListItem_2( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCheckListItem_3( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCheckListItem_4( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCheckListItem_5( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCheckListItem_6( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCheckListItem_7( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QCheckListItem_8( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCheckListItem_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCheckListItem_2( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCheckListItem_3( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCheckListItem_4( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCheckListItem_5( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCheckListItem_6( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCheckListItem_7( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQCheckListItem_8( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -123,7 +123,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQCheckListItem *instance; // Temp
+   TTQCheckListItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcombobox_imp.cpp b/kjsembed/qtbindings/qcombobox_imp.cpp
index 330da994..28cf620c 100644
--- a/kjsembed/qtbindings/qcombobox_imp.cpp
+++ b/kjsembed/qtbindings/qcombobox_imp.cpp
@@ -21,19 +21,19 @@
  */
 namespace KJSEmbed {
 
-QComboBoxImp::QComboBoxImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQComboBoxImp::TQComboBoxImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QComboBoxImp::~QComboBoxImp()
+TTQComboBoxImp::~TQComboBoxImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QComboBoxImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQComboBoxImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -41,11 +41,11 @@ void QComboBoxImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QComboBoxImp *meth = new QComboBoxImp( exec, methods[idx].id );
+            TQComboBoxImp *meth = new TQComboBoxImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -64,12 +64,12 @@ void QComboBoxImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     EnumValue enums[] = {
 
         // enum Policy
-        { "NoInsertion", TQComboBox::NoInsertion },
-        { "AtTop", TQComboBox::AtTop },
-        { "AtCurrent", TQComboBox::AtCurrent },
-        { "AtBottom", TQComboBox::AtBottom },
-        { "AfterCurrent", TQComboBox::AfterCurrent },
-        { "BeforeCurrent", TQComboBox::BeforeCurrent },
+        { "NoInsertion", TTQComboBox::NoInsertion },
+        { "AtTop", TTQComboBox::AtTop },
+        { "AtCurrent", TTQComboBox::AtCurrent },
+        { "AtBottom", TTQComboBox::AtBottom },
+        { "AfterCurrent", TTQComboBox::AfterCurrent },
+        { "BeforeCurrent", TTQComboBox::BeforeCurrent },
 	{ 0, 0 }
     };
 
@@ -84,7 +84,7 @@ void QComboBoxImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QComboBoxImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQComboBoxImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -137,11 +137,11 @@ void QComboBoxImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QComboBoxImp *meth = new QComboBoxImp( exec, methods[idx].id );
+            TQComboBoxImp *meth = new TQComboBoxImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -150,63 +150,63 @@ void QComboBoxImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQComboBox pointer from an Object.
+ * Extract a TTQComboBox pointer from an Object.
  */
-TQComboBox *QComboBoxImp::toQComboBox( KJS::Object &self )
+TTQComboBox *TQComboBoxImp::toTQComboBox( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQComboBox *>( obj );
+           return dynamic_cast<TTQComboBox *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQComboBox" )
+    if ( op->typeName() != "TTQComboBox" )
         return 0;
 
-    return op->toNative<TQComboBox>();
+    return op->toNative<TTQComboBox>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QComboBoxImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQComboBoxImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QComboBox_1:
-             return QComboBox_1( exec, args );
+             return TQComboBox_1( exec, args );
              break;
 
          case Constructor_QComboBox_2:
-             return QComboBox_2( exec, args );
+             return TQComboBox_2( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QComboBoxCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQComboBoxCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QComboBoxImp::QComboBox_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQComboBoxImp::TQComboBox_1( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TQWidget *
+    // Unsupported parameter TTQWidget *
     return KJS::Value();
 
-    TQWidget * arg0; // Dummy
+    TTQWidget * arg0; // Dummy
 
     const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0;
 
 
-    // We should now create an object of type QComboBoxQComboBox *ret = new TQComboBox(
+    // We should now create an object of type TQComboBoxTQComboBox *ret = new TTQComboBox(
 
           arg0,
           arg1 );
@@ -214,20 +214,20 @@ KJS::Object QComboBoxImp::QComboBox_1( KJS::ExecState *exec, const KJS::List &ar
 return KJS::Object();
 }
 
-KJS::Object QComboBoxImp::QComboBox_2( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQComboBoxImp::TQComboBox_2( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
     bool arg0 = extractBool(exec, args, 0);
 
-    // Unsupported parameter TQWidget *
+    // Unsupported parameter TTQWidget *
     return KJS::Value();
 
-    TQWidget * arg1; // Dummy
+    TTQWidget * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
 
-    // We should now create an object of type QComboBoxQComboBox *ret = new TQComboBox(
+    // We should now create an object of type TQComboBoxTQComboBox *ret = new TTQComboBox(
 
           arg0,
           arg1,
@@ -237,9 +237,9 @@ return KJS::Object();
 
 }
 
-KJS::Value QComboBoxImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQComboBoxImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QComboBoxImp::toQComboBox( self );
+    instance = TQComboBoxImp::toTQComboBox( self );
 
     switch( id ) {
 
@@ -427,12 +427,12 @@ KJS::Value QComboBoxImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
         break;
     }
 
-    TQString msg = i18n( "QComboBoxImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQComboBoxImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QComboBoxImp::count_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::count_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -441,10 +441,10 @@ KJS::Value QComboBoxImp::count_4( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QComboBoxImp::insertStringList_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::insertStringList_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQStringList arg0 = extractQStringList(exec, args, 0);
+    TTQStringList arg0 = extractTQStringList(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -455,10 +455,10 @@ KJS::Value QComboBoxImp::insertStringList_5( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QComboBoxImp::insertStrList_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::insertStrList_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQStrList arg0 = extractQStrList(exec, args, 0);
+    TTQStrList arg0 = extractTQStrList(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -469,13 +469,13 @@ KJS::Value QComboBoxImp::insertStrList_6( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QComboBoxImp::insertStrList_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::insertStrList_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQStrList *
+    // Unsupported parameter const TTQStrList *
     return KJS::Value();
 
-    const TQStrList * arg0; // Dummy
+    const TTQStrList * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -486,7 +486,7 @@ KJS::Value QComboBoxImp::insertStrList_7( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QComboBoxImp::insertStrList_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::insertStrList_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     // Unsupported parameter const char **
@@ -506,10 +506,10 @@ KJS::Value QComboBoxImp::insertStrList_8( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QComboBoxImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -520,10 +520,10 @@ KJS::Value QComboBoxImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QComboBoxImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPixmap arg0 = extractQPixmap(exec, args, 0);
+    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -534,12 +534,12 @@ KJS::Value QComboBoxImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPixmap arg0 = extractQPixmap(exec, args, 0);
+    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
-    TQString arg1 = extractQString(exec, args, 1);
+    TTQString arg1 = extractTQString(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -551,7 +551,7 @@ KJS::Value QComboBoxImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::removeItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::removeItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -562,7 +562,7 @@ KJS::Value QComboBoxImp::removeItem_12( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::currentItem_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::currentItem_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -571,7 +571,7 @@ KJS::Value QComboBoxImp::currentItem_13( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::setCurrentItem_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setCurrentItem_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -582,19 +582,19 @@ KJS::Value QComboBoxImp::setCurrentItem_14( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QComboBoxImp::currentText_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::currentText_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->currentText(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QComboBoxImp::setCurrentText_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setCurrentText_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
       instance->setCurrentText(
        arg0 );
@@ -602,33 +602,33 @@ KJS::Value QComboBoxImp::setCurrentText_16( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QComboBoxImp::text_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::text_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-      TQString ret;
+      TTQString ret;
       ret = instance->text(
        arg0 );
       return KJS::String( ret );
 
 }
 
-KJS::Value QComboBoxImp::pixmap_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::pixmap_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
       instance->pixmap(
        arg0 );
-      return KJS::Value(); // Returns 'const TQPixmap *'
+      return KJS::Value(); // Returns 'const TTQPixmap *'
 
 }
 
-KJS::Value QComboBoxImp::changeItem_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::changeItem_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -639,10 +639,10 @@ KJS::Value QComboBoxImp::changeItem_19( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::changeItem_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::changeItem_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPixmap arg0 = extractQPixmap(exec, args, 0);
+    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -653,12 +653,12 @@ KJS::Value QComboBoxImp::changeItem_20( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::changeItem_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::changeItem_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPixmap arg0 = extractQPixmap(exec, args, 0);
+    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
-    TQString arg1 = extractQString(exec, args, 1);
+    TTQString arg1 = extractTQString(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -670,7 +670,7 @@ KJS::Value QComboBoxImp::changeItem_21( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::autoResize_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::autoResize_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -679,7 +679,7 @@ KJS::Value QComboBoxImp::autoResize_22( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::setAutoResize_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setAutoResize_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -690,19 +690,19 @@ KJS::Value QComboBoxImp::setAutoResize_23( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QComboBoxImp::sizeHint_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::sizeHint_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQSize ret;
+    TTQSize ret;
       ret = instance->sizeHint(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QComboBoxImp::setPalette_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setPalette_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPalette arg0 = extractQPalette(exec, args, 0);
+    TTQPalette arg0 = extractTQPalette(exec, args, 0);
 
       instance->setPalette(
        arg0 );
@@ -710,10 +710,10 @@ KJS::Value QComboBoxImp::setPalette_25( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::setFont_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setFont_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQFont arg0 = extractQFont(exec, args, 0);
+    TTQFont arg0 = extractTQFont(exec, args, 0);
 
       instance->setFont(
        arg0 );
@@ -721,7 +721,7 @@ KJS::Value QComboBoxImp::setFont_26( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QComboBoxImp::setEnabled_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setEnabled_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -732,7 +732,7 @@ KJS::Value QComboBoxImp::setEnabled_27( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::setSizeLimit_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setSizeLimit_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -743,7 +743,7 @@ KJS::Value QComboBoxImp::setSizeLimit_28( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QComboBoxImp::sizeLimit_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::sizeLimit_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -752,7 +752,7 @@ KJS::Value QComboBoxImp::sizeLimit_29( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QComboBoxImp::setMaxCount_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setMaxCount_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -763,7 +763,7 @@ KJS::Value QComboBoxImp::setMaxCount_30( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::maxCount_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::maxCount_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -772,10 +772,10 @@ KJS::Value QComboBoxImp::maxCount_31( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QComboBoxImp::setInsertionPolicy_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setInsertionPolicy_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQComboBox::Policy arg0 = TQComboBox::AtBottom; // TODO (hack for combo box)
+    TTQComboBox::Policy arg0 = TTQComboBox::AtBottom; // TODO (hack for combo box)
 
       instance->setInsertionPolicy(
        arg0 );
@@ -783,7 +783,7 @@ KJS::Value QComboBoxImp::setInsertionPolicy_32( KJS::ExecState *exec, KJS::Objec
 
 }
 
-KJS::Value QComboBoxImp::insertionPolicy_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::insertionPolicy_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->insertionPolicy(  );
@@ -791,13 +791,13 @@ KJS::Value QComboBoxImp::insertionPolicy_33( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QComboBoxImp::setValidator_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setValidator_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQValidator *
+    // Unsupported parameter const TTQValidator *
     return KJS::Value();
 
-    const TQValidator * arg0; // Dummy
+    const TTQValidator * arg0; // Dummy
 
       instance->setValidator(
        arg0 );
@@ -805,21 +805,21 @@ KJS::Value QComboBoxImp::setValidator_34( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QComboBoxImp::validator_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::validator_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->validator(  );
-      return KJS::Value(); // Returns 'const TQValidator *'
+      return KJS::Value(); // Returns 'const TTQValidator *'
 
 }
 
-KJS::Value QComboBoxImp::setListBox_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setListBox_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListBox *
+    // Unsupported parameter TTQListBox *
     return KJS::Value();
 
-    TQListBox * arg0; // Dummy
+    TTQListBox * arg0; // Dummy
 
       instance->setListBox(
        arg0 );
@@ -827,21 +827,21 @@ KJS::Value QComboBoxImp::setListBox_36( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::listBox_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::listBox_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->listBox(  );
-      return KJS::Value(); // Returns 'TQListBox *'
+      return KJS::Value(); // Returns 'TTQListBox *'
 
 }
 
-KJS::Value QComboBoxImp::setLineEdit_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setLineEdit_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQLineEdit *
+    // Unsupported parameter TTQLineEdit *
     return KJS::Value();
 
-    TQLineEdit * arg0; // Dummy
+    TTQLineEdit * arg0; // Dummy
 
       instance->setLineEdit(
        arg0 );
@@ -849,15 +849,15 @@ KJS::Value QComboBoxImp::setLineEdit_38( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::lineEdit_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::lineEdit_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->lineEdit(  );
-      return KJS::Value(); // Returns 'TQLineEdit *'
+      return KJS::Value(); // Returns 'TTQLineEdit *'
 
 }
 
-KJS::Value QComboBoxImp::setAutoCompletion_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setAutoCompletion_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -868,7 +868,7 @@ KJS::Value QComboBoxImp::setAutoCompletion_40( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QComboBoxImp::autoCompletion_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::autoCompletion_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -877,18 +877,18 @@ KJS::Value QComboBoxImp::autoCompletion_41( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QComboBoxImp::eventFilter_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::eventFilter_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQObject *
+    // Unsupported parameter TTQObject *
     return KJS::Value();
 
-    TQObject * arg0; // Dummy
+    TTQObject * arg0; // Dummy
 
-    // Unsupported parameter TQEvent *
+    // Unsupported parameter TTQEvent *
     return KJS::Value();
 
-    TQEvent * arg1; // Dummy
+    TTQEvent * arg1; // Dummy
 
       bool ret;
       ret = instance->eventFilter(
@@ -898,7 +898,7 @@ KJS::Value QComboBoxImp::eventFilter_42( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::setDuplicatesEnabled_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setDuplicatesEnabled_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -909,7 +909,7 @@ KJS::Value QComboBoxImp::setDuplicatesEnabled_43( KJS::ExecState *exec, KJS::Obj
 
 }
 
-KJS::Value QComboBoxImp::duplicatesEnabled_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::duplicatesEnabled_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -918,7 +918,7 @@ KJS::Value QComboBoxImp::duplicatesEnabled_44( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QComboBoxImp::editable_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::editable_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -927,7 +927,7 @@ KJS::Value QComboBoxImp::editable_45( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QComboBoxImp::setEditable_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::setEditable_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -938,7 +938,7 @@ KJS::Value QComboBoxImp::setEditable_46( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QComboBoxImp::popup_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::popup_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->popup(  );
@@ -946,7 +946,7 @@ KJS::Value QComboBoxImp::popup_47( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QComboBoxImp::hide_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQComboBoxImp::hide_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->hide(  );
diff --git a/kjsembed/qtbindings/qcombobox_imp.h b/kjsembed/qtbindings/qcombobox_imp.h
index a11fba7c..f625e73b 100644
--- a/kjsembed/qtbindings/qcombobox_imp.h
+++ b/kjsembed/qtbindings/qcombobox_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQComboBox;
+class TTQComboBox;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQComboBox;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQComboBox methods.
+ * Wrapper class for TTQComboBox methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QComboBoxImp : public JSProxyImp
+class TQComboBoxImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -83,8 +83,8 @@ public:
        Method_Last = -1
    };
 
-   QComboBoxImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QComboBoxImp();
+   TQComboBoxImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQComboBoxImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -98,14 +98,14 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQComboBox *toQComboBox( KJS::Object &object );
+   static TTQComboBox *toTQComboBox( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QComboBox_1( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QComboBox_2( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQComboBox_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQComboBox_2( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -174,7 +174,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQComboBox *instance; // Temp
+   TTQComboBox *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qframe_imp.cpp b/kjsembed/qtbindings/qframe_imp.cpp
index 146e6bb2..806babee 100644
--- a/kjsembed/qtbindings/qframe_imp.cpp
+++ b/kjsembed/qtbindings/qframe_imp.cpp
@@ -12,7 +12,7 @@
  * Namespace containing the KJSEmbed library.
  */
 namespace KJSEmbed {
-void QFrameImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQFrameImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     //
     // Define the enum constants
@@ -25,25 +25,25 @@ void QFrameImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     EnumValue enums[] = {
 
         // enum Shape
-        { "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 },
+        { "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 },
         // enum Shadow
-        { "Plain", TQFrame::Plain },
-        { "Raised", TQFrame::Raised },
-        { "Sunken", TQFrame::Sunken },
-        { "MShadow", TQFrame::MShadow },
+        { "Plain", TTQFrame::Plain },
+        { "Raised", TTQFrame::Raised },
+        { "Sunken", TTQFrame::Sunken },
+        { "MShadow", TTQFrame::MShadow },
 	{ 0, 0 }
     };
 
diff --git a/kjsembed/qtbindings/qframe_imp.h b/kjsembed/qtbindings/qframe_imp.h
index 3d386e23..e6a255fe 100644
--- a/kjsembed/qtbindings/qframe_imp.h
+++ b/kjsembed/qtbindings/qframe_imp.h
@@ -14,11 +14,11 @@
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQFrame enums.
+ * Wrapper class for TTQFrame enums.
  *
  * @author Ian Reinhart Geiser, geiseri@kde.org
  */
-class QFrameImp
+class TQFrameImp
 {
 public:
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
diff --git a/kjsembed/qtbindings/qlistview_imp.cpp b/kjsembed/qtbindings/qlistview_imp.cpp
index ef670d95..610d5fc0 100644
--- a/kjsembed/qtbindings/qlistview_imp.cpp
+++ b/kjsembed/qtbindings/qlistview_imp.cpp
@@ -22,16 +22,16 @@
  */
 namespace KJSEmbed {
 
-QListViewImp::QListViewImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQListViewImp::TQListViewImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QListViewImp::~QListViewImp()
+TTQListViewImp::~TQListViewImp()
 {
 }
 
-void QListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -108,11 +108,11 @@ void QListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].id ) {
         if ( lastName != methods[idx].name ) {
-            QListViewImp *meth = new QListViewImp( exec, methods[idx].id );
+            TQListViewImp *meth = new TQListViewImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -131,20 +131,20 @@ void QListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     EnumValue enums[] = {
 
         // enum WidthMode
-        { "Manual", TQListView::Manual },
-        { "Maximum", TQListView::Maximum },
+        { "Manual", TTQListView::Manual },
+        { "Maximum", TTQListView::Maximum },
         // enum SelectionMode
-        { "Single", TQListView::Single },
-        { "Multi", TQListView::Multi },
-        { "Extended", TQListView::Extended },
-        { "NoSelection", TQListView::NoSelection },
+        { "Single", TTQListView::Single },
+        { "Multi", TTQListView::Multi },
+        { "Extended", TTQListView::Extended },
+        { "NoSelection", TTQListView::NoSelection },
         // enum ResizeMode
-        { "NoColumn", TQListView::NoColumn },
-        { "AllColumns", TQListView::AllColumns },
-        { "LastColumn", TQListView::LastColumn },
+        { "NoColumn", TTQListView::NoColumn },
+        { "AllColumns", TTQListView::AllColumns },
+        { "LastColumn", TTQListView::LastColumn },
         // enum RenameAction
-        { "Accept", TQListView::Accept },
-        { "Reject", TQListView::Reject },
+        { "Accept", TTQListView::Accept },
+        { "Reject", TTQListView::Reject },
 	{ 0, 0 }
     };
 
@@ -156,60 +156,60 @@ void QListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 
 }
 
-TQListView *QListViewImp::toQListView( KJS::Object &self )
+TTQListView *TQListViewImp::toTQListView( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQListView *>( obj );
+           return dynamic_cast<TTQListView *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQListView" )
+    if ( op->typeName() != "TTQListView" )
         return 0;
 
-    return op->toNative<TQListView>();
+    return op->toNative<TTQListView>();
 }
 
 
-KJS::Object QListViewImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQListViewImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QListView_1:
-             return QListView_1( exec, args );
+             return TQListView_1( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QListViewCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQListViewCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QListViewImp::QListView_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQListViewImp::TQListView_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
     // TODO
-    TQWidget *arg0 = 0L;
+    TTQWidget *arg0 = 0L;
 
     // TODO
-    TQWidget *arg1 = 0L;
+    TTQWidget *arg1 = 0L;
 
     // TODO
-    TQWidget *arg2 = 0L;
+    TTQWidget *arg2 = 0L;
 
 }
 
-KJS::Value QListViewImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQListViewImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QListViewImp::toQListView( self );
+    instance = TQListViewImp::toTQListView( self );
 
     switch( id ) {
 
@@ -493,12 +493,12 @@ KJS::Value QListViewImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
         break;
     }
 
-    TQString msg = i18n( "QListViewImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQListViewImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QListViewImp::treeStepSize_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::treeStepSize_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -507,7 +507,7 @@ KJS::Value QListViewImp::treeStepSize_3( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::setTreeStepSize_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setTreeStepSize_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -518,13 +518,13 @@ KJS::Value QListViewImp::setTreeStepSize_4( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QListViewImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
       instance->insertItem(
        arg0 );
@@ -532,13 +532,13 @@ KJS::Value QListViewImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QListViewImp::takeItem_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::takeItem_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
       instance->takeItem(
        arg0 );
@@ -546,13 +546,13 @@ KJS::Value QListViewImp::takeItem_6( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QListViewImp::removeItem_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::removeItem_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
       instance->removeItem(
        arg0 );
@@ -560,18 +560,18 @@ KJS::Value QListViewImp::removeItem_7( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QListViewImp::header_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::header_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->header(  );
-      return KJS::Value(); // Returns 'TQHeader *'
+      return KJS::Value(); // Returns 'TTQHeader *'
 
 }
 
-KJS::Value QListViewImp::addColumn_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::addColumn_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1;
 
@@ -583,15 +583,15 @@ KJS::Value QListViewImp::addColumn_9( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QListViewImp::addColumn_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::addColumn_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QIconSet
+    // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TQIconSet  arg0; // Dummy
+    const TTQIconSet  arg0; // Dummy
 
-    TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null;
+    TTQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TTQString::null;
 
     int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1;
 
@@ -604,7 +604,7 @@ KJS::Value QListViewImp::addColumn_10( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QListViewImp::removeColumn_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::removeColumn_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -615,12 +615,12 @@ KJS::Value QListViewImp::removeColumn_11( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QListViewImp::setColumnText_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setColumnText_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
 
-    TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null;
+    TTQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TTQString::null;
 
       instance->setColumnText(
        arg0,
@@ -629,17 +629,17 @@ KJS::Value QListViewImp::setColumnText_12( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QListViewImp::setColumnText_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setColumnText_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
 
-    // Unsupported parameter const QIconSet
+    // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TQIconSet  arg1; // Dummy
+    const TTQIconSet  arg1; // Dummy
 
-    TQString arg2 = (args.size() >= 3) ? args[2].toString(exec).qstring() : TQString::null;
+    TTQString arg2 = (args.size() >= 3) ? args[2].toString(exec).qstring() : TTQString::null;
 
       instance->setColumnText(
        arg0,
@@ -649,19 +649,19 @@ KJS::Value QListViewImp::setColumnText_13( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QListViewImp::columnText_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::columnText_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
 
-      TQString ret;
+      TTQString ret;
       ret = instance->columnText(
        arg0 );
       return KJS::String( ret );
 
 }
 
-KJS::Value QListViewImp::setColumnWidth_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setColumnWidth_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -675,7 +675,7 @@ KJS::Value QListViewImp::setColumnWidth_15( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QListViewImp::columnWidth_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::columnWidth_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -687,7 +687,7 @@ KJS::Value QListViewImp::columnWidth_16( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::setColumnWidthMode_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setColumnWidthMode_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -704,7 +704,7 @@ KJS::Value QListViewImp::setColumnWidthMode_17( KJS::ExecState *exec, KJS::Objec
 
 }
 
-KJS::Value QListViewImp::columnWidthMode_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::columnWidthMode_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -715,7 +715,7 @@ KJS::Value QListViewImp::columnWidthMode_18( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QListViewImp::columns_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::columns_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -724,7 +724,7 @@ KJS::Value QListViewImp::columns_19( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QListViewImp::setColumnAlignment_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setColumnAlignment_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -738,7 +738,7 @@ KJS::Value QListViewImp::setColumnAlignment_20( KJS::ExecState *exec, KJS::Objec
 
 }
 
-KJS::Value QListViewImp::columnAlignment_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::columnAlignment_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -750,7 +750,7 @@ KJS::Value QListViewImp::columnAlignment_21( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QListViewImp::show_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::show_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->show(  );
@@ -758,41 +758,41 @@ KJS::Value QListViewImp::show_22( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QListViewImp::itemAt_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::itemAt_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQPoint &
+    // Unsupported parameter const TTQPoint &
     return KJS::Value();
 
-    const TQPoint & arg0; // Dummy
+    const TTQPoint & arg0; // Dummy
 
       instance->itemAt(
        arg0 );
-      return KJS::Value(); // Returns 'TQListViewItem *'
+      return KJS::Value(); // Returns 'TTQListViewItem *'
 
 }
 
-KJS::Value QListViewImp::itemRect_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::itemRect_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQListViewItem *
+    // Unsupported parameter const TTQListViewItem *
     return KJS::Value();
 
-    const TQListViewItem * arg0; // Dummy
+    const TTQListViewItem * arg0; // Dummy
 
       instance->itemRect(
        arg0 );
-      return KJS::Value(); // Returns 'QRect'
+      return KJS::Value(); // Returns 'TQRect'
 
 }
 
-KJS::Value QListViewImp::itemPos_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::itemPos_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQListViewItem *
+    // Unsupported parameter const TTQListViewItem *
     return KJS::Value();
 
-    const TQListViewItem * arg0; // Dummy
+    const TTQListViewItem * arg0; // Dummy
 
       int ret;
       ret = instance->itemPos(
@@ -801,13 +801,13 @@ KJS::Value QListViewImp::itemPos_25( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QListViewImp::ensureItemVisible_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::ensureItemVisible_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQListViewItem *
+    // Unsupported parameter const TTQListViewItem *
     return KJS::Value();
 
-    const TQListViewItem * arg0; // Dummy
+    const TTQListViewItem * arg0; // Dummy
 
       instance->ensureItemVisible(
        arg0 );
@@ -815,13 +815,13 @@ KJS::Value QListViewImp::ensureItemVisible_26( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QListViewImp::repaintItem_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::repaintItem_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQListViewItem *
+    // Unsupported parameter const TTQListViewItem *
     return KJS::Value();
 
-    const TQListViewItem * arg0; // Dummy
+    const TTQListViewItem * arg0; // Dummy
 
       instance->repaintItem(
        arg0 );
@@ -829,7 +829,7 @@ KJS::Value QListViewImp::repaintItem_27( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::setMultiSelection_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setMultiSelection_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = (args.size() >= 1) ? args[0].toBoolean(exec) : false;
@@ -840,7 +840,7 @@ KJS::Value QListViewImp::setMultiSelection_28( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QListViewImp::isMultiSelection_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::isMultiSelection_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -849,7 +849,7 @@ KJS::Value QListViewImp::isMultiSelection_29( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QListViewImp::setSelectionMode_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setSelectionMode_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     // Unsupported parameter SelectionMode
@@ -863,7 +863,7 @@ KJS::Value QListViewImp::setSelectionMode_30( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QListViewImp::selectionMode_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::selectionMode_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->selectionMode(  );
@@ -871,7 +871,7 @@ KJS::Value QListViewImp::selectionMode_31( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QListViewImp::clearSelection_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::clearSelection_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->clearSelection(  );
@@ -879,13 +879,13 @@ KJS::Value QListViewImp::clearSelection_32( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QListViewImp::setSelected_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setSelected_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
@@ -896,13 +896,13 @@ KJS::Value QListViewImp::setSelected_33( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::setSelectionAnchor_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setSelectionAnchor_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
       instance->setSelectionAnchor(
        arg0 );
@@ -910,13 +910,13 @@ KJS::Value QListViewImp::setSelectionAnchor_34( KJS::ExecState *exec, KJS::Objec
 
 }
 
-KJS::Value QListViewImp::isSelected_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::isSelected_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQListViewItem *
+    // Unsupported parameter const TTQListViewItem *
     return KJS::Value();
 
-    const TQListViewItem * arg0; // Dummy
+    const TTQListViewItem * arg0; // Dummy
 
       bool ret;
       ret = instance->isSelected(
@@ -925,21 +925,21 @@ KJS::Value QListViewImp::isSelected_35( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::selectedItem_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::selectedItem_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->selectedItem(  );
-      return KJS::Value(); // Returns 'TQListViewItem *'
+      return KJS::Value(); // Returns 'TTQListViewItem *'
 
 }
 
-KJS::Value QListViewImp::setOpen_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setOpen_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
@@ -950,13 +950,13 @@ KJS::Value QListViewImp::setOpen_37( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QListViewImp::isOpen_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::isOpen_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQListViewItem *
+    // Unsupported parameter const TTQListViewItem *
     return KJS::Value();
 
-    const TQListViewItem * arg0; // Dummy
+    const TTQListViewItem * arg0; // Dummy
 
       bool ret;
       ret = instance->isOpen(
@@ -965,13 +965,13 @@ KJS::Value QListViewImp::isOpen_38( KJS::ExecState *exec, KJS::Object &obj, cons
 
 }
 
-KJS::Value QListViewImp::setCurrentItem_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setCurrentItem_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
       instance->setCurrentItem(
        arg0 );
@@ -979,31 +979,31 @@ KJS::Value QListViewImp::setCurrentItem_39( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QListViewImp::currentItem_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::currentItem_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->currentItem(  );
-      return KJS::Value(); // Returns 'TQListViewItem *'
+      return KJS::Value(); // Returns 'TTQListViewItem *'
 
 }
 
-KJS::Value QListViewImp::firstChild_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::firstChild_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->firstChild(  );
-      return KJS::Value(); // Returns 'TQListViewItem *'
+      return KJS::Value(); // Returns 'TTQListViewItem *'
 
 }
 
-KJS::Value QListViewImp::lastItem_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::lastItem_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->lastItem(  );
-      return KJS::Value(); // Returns 'TQListViewItem *'
+      return KJS::Value(); // Returns 'TTQListViewItem *'
 
 }
 
-KJS::Value QListViewImp::childCount_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::childCount_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -1012,7 +1012,7 @@ KJS::Value QListViewImp::childCount_43( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::setAllColumnsShowFocus_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setAllColumnsShowFocus_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = (args.size() >= 1) ? args[0].toBoolean(exec) : false;
@@ -1023,7 +1023,7 @@ KJS::Value QListViewImp::setAllColumnsShowFocus_44( KJS::ExecState *exec, KJS::O
 
 }
 
-KJS::Value QListViewImp::allColumnsShowFocus_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::allColumnsShowFocus_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -1032,7 +1032,7 @@ KJS::Value QListViewImp::allColumnsShowFocus_45( KJS::ExecState *exec, KJS::Obje
 
 }
 
-KJS::Value QListViewImp::setItemMargin_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setItemMargin_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -1043,7 +1043,7 @@ KJS::Value QListViewImp::setItemMargin_46( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QListViewImp::itemMargin_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::itemMargin_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -1052,7 +1052,7 @@ KJS::Value QListViewImp::itemMargin_47( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::setRootIsDecorated_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setRootIsDecorated_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = (args.size() >= 1) ? args[0].toBoolean(exec) : false;
@@ -1063,7 +1063,7 @@ KJS::Value QListViewImp::setRootIsDecorated_48( KJS::ExecState *exec, KJS::Objec
 
 }
 
-KJS::Value QListViewImp::rootIsDecorated_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::rootIsDecorated_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -1072,7 +1072,7 @@ KJS::Value QListViewImp::rootIsDecorated_49( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QListViewImp::setSorting_50( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setSorting_50( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -1086,7 +1086,7 @@ KJS::Value QListViewImp::setSorting_50( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::sortColumn_51( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::sortColumn_51( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -1095,7 +1095,7 @@ KJS::Value QListViewImp::sortColumn_51( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::setSortColumn_52( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setSortColumn_52( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
@@ -1106,7 +1106,7 @@ KJS::Value QListViewImp::setSortColumn_52( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QListViewImp::sortOrder_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::sortOrder_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->sortOrder(  );
@@ -1114,7 +1114,7 @@ KJS::Value QListViewImp::sortOrder_53( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QListViewImp::setSortOrder_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setSortOrder_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     // Unsupported parameter SortOrder
@@ -1128,7 +1128,7 @@ KJS::Value QListViewImp::setSortOrder_54( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QListViewImp::sort_55( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::sort_55( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->sort(  );
@@ -1136,10 +1136,10 @@ KJS::Value QListViewImp::sort_55( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QListViewImp::setFont_56( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setFont_56( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQFont arg0; // TODO
+    TTQFont arg0; // TODO
 
       instance->setFont(
        arg0 );
@@ -1147,10 +1147,10 @@ KJS::Value QListViewImp::setFont_56( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QListViewImp::setPalette_57( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setPalette_57( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPalette arg0; // TODO
+    TTQPalette arg0; // TODO
 
       instance->setPalette(
        arg0 );
@@ -1158,18 +1158,18 @@ KJS::Value QListViewImp::setPalette_57( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::eventFilter_58( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::eventFilter_58( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQObject *
+    // Unsupported parameter TTQObject *
     return KJS::Value();
 
-    TQObject * arg0; // Dummy
+    TTQObject * arg0; // Dummy
 
-    // Unsupported parameter TQEvent *
+    // Unsupported parameter TTQEvent *
     return KJS::Value();
 
-    TQEvent * arg1; // Dummy
+    TTQEvent * arg1; // Dummy
 
       bool ret;
       ret = instance->eventFilter(
@@ -1179,23 +1179,23 @@ KJS::Value QListViewImp::eventFilter_58( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::sizeHint_59( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::sizeHint_59( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->sizeHint(  );
-      return KJS::Value(); // Returns 'QSize'
+      return KJS::Value(); // Returns 'TQSize'
 
 }
 
-KJS::Value QListViewImp::minimumSizeHint_60( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::minimumSizeHint_60( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->minimumSizeHint(  );
-      return KJS::Value(); // Returns 'QSize'
+      return KJS::Value(); // Returns 'TQSize'
 
 }
 
-KJS::Value QListViewImp::setShowSortIndicator_61( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setShowSortIndicator_61( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = (args.size() >= 1) ? args[0].toBoolean(exec) : false;
@@ -1206,7 +1206,7 @@ KJS::Value QListViewImp::setShowSortIndicator_61( KJS::ExecState *exec, KJS::Obj
 
 }
 
-KJS::Value QListViewImp::showSortIndicator_62( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::showSortIndicator_62( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -1215,7 +1215,7 @@ KJS::Value QListViewImp::showSortIndicator_62( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QListViewImp::setShowToolTips_63( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setShowToolTips_63( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = (args.size() >= 1) ? args[0].toBoolean(exec) : false;
@@ -1226,7 +1226,7 @@ KJS::Value QListViewImp::setShowToolTips_63( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QListViewImp::showToolTips_64( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::showToolTips_64( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -1235,7 +1235,7 @@ KJS::Value QListViewImp::showToolTips_64( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QListViewImp::setResizeMode_65( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setResizeMode_65( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     // Unsupported parameter ResizeMode
@@ -1249,7 +1249,7 @@ KJS::Value QListViewImp::setResizeMode_65( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QListViewImp::resizeMode_66( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::resizeMode_66( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->resizeMode(  );
@@ -1257,10 +1257,10 @@ KJS::Value QListViewImp::resizeMode_66( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::findItem_67( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::findItem_67( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
+    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
 
     int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1;
 
@@ -1273,11 +1273,11 @@ KJS::Value QListViewImp::findItem_67( KJS::ExecState *exec, KJS::Object &obj, co
        arg0,
        arg1,
        arg2 );
-      return KJS::Value(); // Returns 'TQListViewItem *'
+      return KJS::Value(); // Returns 'TTQListViewItem *'
 
 }
 
-KJS::Value QListViewImp::setDefaultRenameAction_68( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::setDefaultRenameAction_68( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     // Unsupported parameter RenameAction
@@ -1291,7 +1291,7 @@ KJS::Value QListViewImp::setDefaultRenameAction_68( KJS::ExecState *exec, KJS::O
 
 }
 
-KJS::Value QListViewImp::defaultRenameAction_69( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::defaultRenameAction_69( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->defaultRenameAction(  );
@@ -1299,7 +1299,7 @@ KJS::Value QListViewImp::defaultRenameAction_69( KJS::ExecState *exec, KJS::Obje
 
 }
 
-KJS::Value QListViewImp::isRenaming_70( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::isRenaming_70( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -1308,7 +1308,7 @@ KJS::Value QListViewImp::isRenaming_70( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewImp::hideColumn_71( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewImp::hideColumn_71( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
diff --git a/kjsembed/qtbindings/qlistview_imp.h b/kjsembed/qtbindings/qlistview_imp.h
index 22786b8d..f201c179 100644
--- a/kjsembed/qtbindings/qlistview_imp.h
+++ b/kjsembed/qtbindings/qlistview_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQListView;
+class TTQListView;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQListView;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQListView methods.
+ * Wrapper class for TTQListView methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QListViewImp : public JSProxyImp
+class TQListViewImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -106,18 +106,18 @@ public:
        Method_Last = -1
    };
 
-   QListViewImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QListViewImp();
+   TQListViewImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQListViewImp();
 
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQListView *toQListView( KJS::Object &object );
+   static TTQListView *toTQListView( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QListView_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQListView_1( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -210,7 +210,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQListView *instance; // Temp
+   TTQListView *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qlistviewitem_imp.cpp b/kjsembed/qtbindings/qlistviewitem_imp.cpp
index 13765e2b..69d94009 100644
--- a/kjsembed/qtbindings/qlistviewitem_imp.cpp
+++ b/kjsembed/qtbindings/qlistviewitem_imp.cpp
@@ -22,7 +22,7 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-    KJS::Object QListViewItemLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const
+    KJS::Object TQListViewItemLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const
     {
         if ( args.size() == 0 ) {
                         // FALL THRU
@@ -31,17 +31,17 @@ namespace Bindings {
             JSOpaqueProxy *prx = 0;
 
             if ( arg0 ) {
-                if ( arg0->typeName() == "TQListViewItem" ) {
-                    TQListViewItem * parent = arg0->toNative<TQListViewItem>();
-                    prx = new JSOpaqueProxy( new TQListViewItem( parent ), "TQListViewItem" );
+                if ( arg0->typeName() == "TTQListViewItem" ) {
+                    TTQListViewItem * parent = arg0->toNative<TTQListViewItem>();
+                    prx = new JSOpaqueProxy( new TTQListViewItem( parent ), "TTQListViewItem" );
                 } else {
                     return KJS::Object();
                 }
             } else {
                 JSObjectProxy *arg0 = JSProxy::toObjectProxy( args[ 0 ].imp() );
                 if ( arg0 ) {
-                    TQListView * parent = ( TQListView * ) ( arg0->widget() );
-                    prx = new JSOpaqueProxy( new TQListViewItem( parent ), "TQListViewItem" );
+                    TTQListView * parent = ( TTQListView * ) ( arg0->widget() );
+                    prx = new JSOpaqueProxy( new TTQListViewItem( parent ), "TTQListViewItem" );
                 } else {
                     return KJS::Object();
                 }
@@ -54,25 +54,25 @@ namespace Bindings {
         return KJS::Object();
     }
     
-    void QListViewItemLoader::addBindings( KJSEmbedPart *jspart, KJS::ExecState *exec, KJS::Object &proxy ) const
+    void TQListViewItemLoader::addBindings( KJSEmbedPart *jspart, KJS::ExecState *exec, KJS::Object &proxy ) const
     {
-        QListViewItemImp::addBindings( exec, proxy );
+        TQListViewItemImp::addBindings( exec, proxy );
     }
 }
 
-QListViewItemImp::QListViewItemImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQListViewItemImp::TQListViewItemImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QListViewItemImp::~QListViewItemImp()
+TTQListViewItemImp::~TQListViewItemImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QListViewItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQListViewItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -80,11 +80,11 @@ void QListViewItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QListViewItemImp *meth = new QListViewItemImp( exec, methods[idx].id );
+            TQListViewItemImp *meth = new TQListViewItemImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -97,7 +97,7 @@ void QListViewItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QListViewItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQListViewItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -159,11 +159,11 @@ void QListViewItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QListViewItemImp *meth = new QListViewItemImp( exec, methods[idx].id );
+            TQListViewItemImp *meth = new TQListViewItemImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -172,81 +172,81 @@ void QListViewItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQListViewItem pointer from an Object.
+ * Extract a TTQListViewItem pointer from an Object.
  */
-TQListViewItem *QListViewItemImp::toQListViewItem( KJS::Object &self )
+TTQListViewItem *TQListViewItemImp::toTQListViewItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQListViewItem *>( obj );
+           return dynamic_cast<TTQListViewItem *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
-    return op->toNative<TQListViewItem>();
+    return op->toNative<TTQListViewItem>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QListViewItemImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQListViewItemImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QListViewItem_1:
-             return QListViewItem_1( exec, args );
+             return TQListViewItem_1( exec, args );
              break;
 
          case Constructor_QListViewItem_2:
-             return QListViewItem_2( exec, args );
+             return TQListViewItem_2( exec, args );
              break;
 
          case Constructor_QListViewItem_3:
-             return QListViewItem_3( exec, args );
+             return TQListViewItem_3( exec, args );
              break;
 
          case Constructor_QListViewItem_4:
-             return QListViewItem_4( exec, args );
+             return TQListViewItem_4( exec, args );
              break;
 
          case Constructor_QListViewItem_5:
-             return QListViewItem_5( exec, args );
+             return TQListViewItem_5( exec, args );
              break;
 
          case Constructor_QListViewItem_6:
-             return QListViewItem_6( exec, args );
+             return TQListViewItem_6( exec, args );
              break;
 
          case Constructor_QListViewItem_7:
-             return QListViewItem_7( exec, args );
+             return TQListViewItem_7( exec, args );
              break;
 
          case Constructor_QListViewItem_8:
-             return QListViewItem_8( exec, args );
+             return TQListViewItem_8( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QListViewItemCons has no constructor with id '%1'.").arg(id);
+    TTQString msg = i18n("TQListViewItemCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QListViewItemImp::QListViewItem_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQListViewItemImp::TQListViewItem_1( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TQListView *
+    // Unsupported parameter TTQListView *
     return KJS::Value();
 
-    TQListView * arg0; // Dummy
+    TTQListView * arg0; // Dummy
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
 
           arg0 );
 #endif
@@ -254,38 +254,38 @@ return KJS::Object();
 
 }
 
-KJS::Object QListViewItemImp::QListViewItem_2( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQListViewItemImp::TQListViewItem_2( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
 
           arg0 );
 #endif
 return KJS::Object();
 }
 
-KJS::Object QListViewItemImp::QListViewItem_3( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQListViewItemImp::TQListViewItem_3( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
 
-    // Unsupported parameter TQListView *
+    // Unsupported parameter TTQListView *
     return KJS::Value();
 
-    TQListView * arg0; // Dummy
+    TTQListView * arg0; // Dummy
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg1; // Dummy
+    TTQListViewItem * arg1; // Dummy
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
 
           arg0,
           arg1 );
@@ -293,22 +293,22 @@ KJS::Object QListViewItemImp::QListViewItem_3( KJS::ExecState *exec, const KJS::
 return KJS::Object();
 }
 
-KJS::Object QListViewItemImp::QListViewItem_4( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQListViewItemImp::TQListViewItem_4( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg1; // Dummy
+    TTQListViewItem * arg1; // Dummy
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
 
           arg0,
           arg1 );
@@ -317,33 +317,33 @@ return KJS::Object();
 
 }
 
-KJS::Object QListViewItemImp::QListViewItem_5( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQListViewItemImp::TQListViewItem_5( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
 
-    // Unsupported parameter TQListView *
+    // Unsupported parameter TTQListView *
     return KJS::Value();
 
-    TQListView * arg0; // Dummy
+    TTQListView * arg0; // Dummy
 
-    TQString arg1 = extractQString(exec, args, 1);
+    TTQString arg1 = extractTQString(exec, args, 1);
 
-    TQString arg2 = extractQString(exec, args, 2);
+    TTQString arg2 = extractTQString(exec, args, 2);
 
-    TQString arg3 = extractQString(exec, args, 3);
+    TTQString arg3 = extractTQString(exec, args, 3);
 
-    TQString arg4 = extractQString(exec, args, 4);
+    TTQString arg4 = extractTQString(exec, args, 4);
 
-    TQString arg5 = extractQString(exec, args, 5);
+    TTQString arg5 = extractTQString(exec, args, 5);
 
-    TQString arg6 = extractQString(exec, args, 6);
+    TTQString arg6 = extractTQString(exec, args, 6);
 
-    TQString arg7 = extractQString(exec, args, 7);
+    TTQString arg7 = extractTQString(exec, args, 7);
 
-    TQString arg8 = extractQString(exec, args, 8);
+    TTQString arg8 = extractTQString(exec, args, 8);
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
 
           arg0,
           arg1,
@@ -359,33 +359,33 @@ return KJS::Object();
 
 }
 
-KJS::Object QListViewItemImp::QListViewItem_6( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQListViewItemImp::TQListViewItem_6( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
-    TQString arg1 = extractQString(exec, args, 1);
+    TTQString arg1 = extractTQString(exec, args, 1);
 
-    TQString arg2 = extractQString(exec, args, 2);
+    TTQString arg2 = extractTQString(exec, args, 2);
 
-    TQString arg3 = extractQString(exec, args, 3);
+    TTQString arg3 = extractTQString(exec, args, 3);
 
-    TQString arg4 = extractQString(exec, args, 4);
+    TTQString arg4 = extractTQString(exec, args, 4);
 
-    TQString arg5 = extractQString(exec, args, 5);
+    TTQString arg5 = extractTQString(exec, args, 5);
 
-    TQString arg6 = extractQString(exec, args, 6);
+    TTQString arg6 = extractTQString(exec, args, 6);
 
-    TQString arg7 = extractQString(exec, args, 7);
+    TTQString arg7 = extractTQString(exec, args, 7);
 
-    TQString arg8 = extractQString(exec, args, 8);
+    TTQString arg8 = extractTQString(exec, args, 8);
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
 
           arg0,
           arg1,
@@ -402,37 +402,37 @@ return KJS::Object();
 
 }
 
-KJS::Object QListViewItemImp::QListViewItem_7( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQListViewItemImp::TQListViewItem_7( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TQListView *
+    // Unsupported parameter TTQListView *
     return KJS::Value();
 
-    TQListView * arg0; // Dummy
+    TTQListView * arg0; // Dummy
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg1; // Dummy
+    TTQListViewItem * arg1; // Dummy
 
-    TQString arg2 = extractQString(exec, args, 2);
+    TTQString arg2 = extractTQString(exec, args, 2);
 
-    TQString arg3 = extractQString(exec, args, 3);
+    TTQString arg3 = extractTQString(exec, args, 3);
 
-    TQString arg4 = extractQString(exec, args, 4);
+    TTQString arg4 = extractTQString(exec, args, 4);
 
-    TQString arg5 = extractQString(exec, args, 5);
+    TTQString arg5 = extractTQString(exec, args, 5);
 
-    TQString arg6 = extractQString(exec, args, 6);
+    TTQString arg6 = extractTQString(exec, args, 6);
 
-    TQString arg7 = extractQString(exec, args, 7);
+    TTQString arg7 = extractTQString(exec, args, 7);
 
-    TQString arg8 = extractQString(exec, args, 8);
+    TTQString arg8 = extractTQString(exec, args, 8);
 
-    TQString arg9 = extractQString(exec, args, 9);
+    TTQString arg9 = extractTQString(exec, args, 9);
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
 
           arg0,
           arg1,
@@ -449,37 +449,37 @@ return KJS::Object();
 
 }
 
-KJS::Object QListViewItemImp::QListViewItem_8( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQListViewItemImp::TQListViewItem_8( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg1; // Dummy
+    TTQListViewItem * arg1; // Dummy
 
-    TQString arg2 = extractQString(exec, args, 2);
+    TTQString arg2 = extractTQString(exec, args, 2);
 
-    TQString arg3 = extractQString(exec, args, 3);
+    TTQString arg3 = extractTQString(exec, args, 3);
 
-    TQString arg4 = extractQString(exec, args, 4);
+    TTQString arg4 = extractTQString(exec, args, 4);
 
-    TQString arg5 = extractQString(exec, args, 5);
+    TTQString arg5 = extractTQString(exec, args, 5);
 
-    TQString arg6 = extractQString(exec, args, 6);
+    TTQString arg6 = extractTQString(exec, args, 6);
 
-    TQString arg7 = extractQString(exec, args, 7);
+    TTQString arg7 = extractTQString(exec, args, 7);
 
-    TQString arg8 = extractQString(exec, args, 8);
+    TTQString arg8 = extractTQString(exec, args, 8);
 
-    TQString arg9 = extractQString(exec, args, 9);
+    TTQString arg9 = extractTQString(exec, args, 9);
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
 
           arg0,
           arg1,
@@ -496,9 +496,9 @@ return KJS::Object();
 
 }
 
-KJS::Value QListViewItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQListViewItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QListViewItemImp::toQListViewItem( self );
+    instance = TQListViewItemImp::toTQListViewItem( self );
 
     switch( id ) {
 
@@ -722,18 +722,18 @@ KJS::Value QListViewItemImp::call( KJS::ExecState *exec, KJS::Object &self, cons
         break;
     }
 
-    TQString msg = i18n( "QListViewItemImp has no method with id '%1'." ).arg( id );
+    TTQString msg = i18n( "TQListViewItemImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QListViewItemImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
       instance->insertItem(
        arg0 );
@@ -741,13 +741,13 @@ KJS::Value QListViewItemImp::insertItem_10( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QListViewItemImp::takeItem_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::takeItem_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
       instance->takeItem(
        arg0 );
@@ -755,13 +755,13 @@ KJS::Value QListViewItemImp::takeItem_11( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QListViewItemImp::removeItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::removeItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
       instance->removeItem(
        arg0 );
@@ -769,7 +769,7 @@ KJS::Value QListViewItemImp::removeItem_12( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QListViewItemImp::height_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::height_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -778,7 +778,7 @@ KJS::Value QListViewItemImp::height_13( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewItemImp::invalidateHeight_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::invalidateHeight_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->invalidateHeight(  );
@@ -786,7 +786,7 @@ KJS::Value QListViewItemImp::invalidateHeight_14( KJS::ExecState *exec, KJS::Obj
 
 }
 
-KJS::Value QListViewItemImp::totalHeight_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::totalHeight_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -795,18 +795,18 @@ KJS::Value QListViewItemImp::totalHeight_15( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QListViewItemImp::width_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::width_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter const TQFontMetrics &
+    // Unsupported parameter const TTQFontMetrics &
     return KJS::Value();
 
-    const TQFontMetrics & arg0; // Dummy
+    const TTQFontMetrics & arg0; // Dummy
 
-    // Unsupported parameter const TQListView *
+    // Unsupported parameter const TTQListView *
     return KJS::Value();
 
-    const TQListView * arg1; // Dummy
+    const TTQListView * arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -821,7 +821,7 @@ return KJS::Object();
 
 }
 
-KJS::Value QListViewItemImp::widthChanged_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::widthChanged_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -832,7 +832,7 @@ KJS::Value QListViewItemImp::widthChanged_17( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QListViewItemImp::depth_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::depth_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -841,12 +841,12 @@ KJS::Value QListViewItemImp::depth_18( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QListViewItemImp::setText_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setText_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-    TQString arg1 = extractQString(exec, args, 1);
+    TTQString arg1 = extractTQString(exec, args, 1);
 
       instance->setText(
        arg0,
@@ -855,24 +855,24 @@ KJS::Value QListViewItemImp::setText_19( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewItemImp::text_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::text_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-      TQString ret;
+      TTQString ret;
       ret = instance->text(
        arg0 );
       return KJS::String( ret );
 
 }
 
-KJS::Value QListViewItemImp::setPixmap_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setPixmap_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-    TQPixmap arg1 = extractQPixmap(exec, args, 1);
+    TTQPixmap arg1 = extractTQPixmap(exec, args, 1);
 
       instance->setPixmap(
        arg0,
@@ -881,25 +881,25 @@ KJS::Value QListViewItemImp::setPixmap_21( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QListViewItemImp::pixmap_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::pixmap_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
       instance->pixmap(
        arg0 );
-      return KJS::Value(); // Returns 'const TQPixmap *'
+      return KJS::Value(); // Returns 'const TTQPixmap *'
 
 }
 
-KJS::Value QListViewItemImp::key_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::key_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
     bool arg1 = extractBool(exec, args, 1);
 
-      TQString ret;
+      TTQString ret;
       ret = instance->key(
        arg0,
        arg1 );
@@ -907,13 +907,13 @@ KJS::Value QListViewItemImp::key_23( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QListViewItemImp::compare_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::compare_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -928,7 +928,7 @@ KJS::Value QListViewItemImp::compare_24( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewItemImp::sortChildItems_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::sortChildItems_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -942,7 +942,7 @@ KJS::Value QListViewItemImp::sortChildItems_25( KJS::ExecState *exec, KJS::Objec
 
 }
 
-KJS::Value QListViewItemImp::childCount_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::childCount_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -951,7 +951,7 @@ KJS::Value QListViewItemImp::childCount_26( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QListViewItemImp::isOpen_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::isOpen_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -960,7 +960,7 @@ KJS::Value QListViewItemImp::isOpen_27( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewItemImp::setOpen_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setOpen_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -971,7 +971,7 @@ KJS::Value QListViewItemImp::setOpen_28( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewItemImp::setup_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setup_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->setup(  );
@@ -979,7 +979,7 @@ KJS::Value QListViewItemImp::setup_29( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QListViewItemImp::setSelected_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setSelected_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -990,7 +990,7 @@ KJS::Value QListViewItemImp::setSelected_30( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QListViewItemImp::isSelected_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::isSelected_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -999,18 +999,18 @@ KJS::Value QListViewItemImp::isSelected_31( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QListViewItemImp::paintCell_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::paintCell_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TQPainter *
+    // Unsupported parameter TTQPainter *
     return KJS::Value();
 
-    TQPainter * arg0; // Dummy
+    TTQPainter * arg0; // Dummy
 
-    // Unsupported parameter const TQColorGroup &
+    // Unsupported parameter const TTQColorGroup &
     return KJS::Value();
 
-    const TQColorGroup & arg1; // Dummy
+    const TTQColorGroup & arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -1030,18 +1030,18 @@ KJS::Value QListViewItemImp::paintCell_32( KJS::ExecState *exec, KJS::Object &ob
 return KJS::Object();
 }
 
-KJS::Value QListViewItemImp::paintBranches_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::paintBranches_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TQPainter *
+    // Unsupported parameter TTQPainter *
     return KJS::Value();
 
-    TQPainter * arg0; // Dummy
+    TTQPainter * arg0; // Dummy
 
-    // Unsupported parameter const TQColorGroup &
+    // Unsupported parameter const TTQColorGroup &
     return KJS::Value();
 
-    const TQColorGroup & arg1; // Dummy
+    const TTQColorGroup & arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -1061,20 +1061,20 @@ return KJS::Object();
 
 }
 
-KJS::Value QListViewItemImp::paintFocus_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::paintFocus_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TQPainter *
+    // Unsupported parameter TTQPainter *
     return KJS::Value();
 
-    TQPainter * arg0; // Dummy
+    TTQPainter * arg0; // Dummy
 
-    // Unsupported parameter const TQColorGroup &
+    // Unsupported parameter const TTQColorGroup &
     return KJS::Value();
 
-    const TQColorGroup & arg1; // Dummy
+    const TTQColorGroup & arg1; // Dummy
 
-    TQRect arg2 = extractQRect(exec, args, 2);
+    TTQRect arg2 = extractTQRect(exec, args, 2);
 
       instance->paintFocus(
        arg0,
@@ -1086,13 +1086,13 @@ return KJS::Object();
 
 }
 
-KJS::Value QListViewItemImp::firstChild_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::firstChild_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQListViewItem *item = instance->firstChild(  );
+      TTQListViewItem *item = instance->firstChild(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TTQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1103,13 +1103,13 @@ KJS::Value QListViewItemImp::firstChild_35( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QListViewItemImp::nextSibling_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::nextSibling_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQListViewItem *item = instance->nextSibling(  );
+      TTQListViewItem *item = instance->nextSibling(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TTQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1120,13 +1120,13 @@ KJS::Value QListViewItemImp::nextSibling_36( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QListViewItemImp::parent_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::parent_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQListViewItem *item = instance->parent(  );
+      TTQListViewItem *item = instance->parent(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TTQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1137,13 +1137,13 @@ KJS::Value QListViewItemImp::parent_37( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewItemImp::itemAbove_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::itemAbove_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQListViewItem *item = instance->itemAbove(  );
+      TTQListViewItem *item = instance->itemAbove(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TTQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1154,13 +1154,13 @@ KJS::Value QListViewItemImp::itemAbove_38( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QListViewItemImp::itemBelow_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::itemBelow_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQListViewItem *item = instance->itemBelow(  );
+      TTQListViewItem *item = instance->itemBelow(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TTQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1171,7 +1171,7 @@ KJS::Value QListViewItemImp::itemBelow_39( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QListViewItemImp::itemPos_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::itemPos_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -1180,15 +1180,15 @@ KJS::Value QListViewItemImp::itemPos_40( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewItemImp::listView_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::listView_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->listView(  );
-      return KJS::Value(); // Returns 'TQListView *'
+      return KJS::Value(); // Returns 'TTQListView *'
 
 }
 
-KJS::Value QListViewItemImp::setSelectable_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setSelectable_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -1199,7 +1199,7 @@ KJS::Value QListViewItemImp::setSelectable_42( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QListViewItemImp::isSelectable_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::isSelectable_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -1208,7 +1208,7 @@ KJS::Value QListViewItemImp::isSelectable_43( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QListViewItemImp::setExpandable_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setExpandable_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -1219,7 +1219,7 @@ KJS::Value QListViewItemImp::setExpandable_44( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QListViewItemImp::isExpandable_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::isExpandable_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -1228,7 +1228,7 @@ KJS::Value QListViewItemImp::isExpandable_45( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QListViewItemImp::repaint_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::repaint_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->repaint(  );
@@ -1236,7 +1236,7 @@ KJS::Value QListViewItemImp::repaint_46( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QListViewItemImp::sort_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::sort_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->sort(  );
@@ -1244,13 +1244,13 @@ KJS::Value QListViewItemImp::sort_47( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QListViewItemImp::moveItem_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::moveItem_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQListViewItem *
+    // Unsupported parameter TTQListViewItem *
     return KJS::Value();
 
-    TQListViewItem * arg0; // Dummy
+    TTQListViewItem * arg0; // Dummy
 
       instance->moveItem(
        arg0 );
@@ -1258,7 +1258,7 @@ KJS::Value QListViewItemImp::moveItem_48( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QListViewItemImp::setDragEnabled_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setDragEnabled_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -1269,7 +1269,7 @@ KJS::Value QListViewItemImp::setDragEnabled_49( KJS::ExecState *exec, KJS::Objec
 
 }
 
-KJS::Value QListViewItemImp::setDropEnabled_50( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setDropEnabled_50( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -1280,7 +1280,7 @@ KJS::Value QListViewItemImp::setDropEnabled_50( KJS::ExecState *exec, KJS::Objec
 
 }
 
-KJS::Value QListViewItemImp::dragEnabled_51( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::dragEnabled_51( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -1289,7 +1289,7 @@ KJS::Value QListViewItemImp::dragEnabled_51( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QListViewItemImp::dropEnabled_52( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::dropEnabled_52( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -1298,13 +1298,13 @@ KJS::Value QListViewItemImp::dropEnabled_52( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QListViewItemImp::acceptDrop_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::acceptDrop_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TQMimeSource *
+    // Unsupported parameter const TTQMimeSource *
     return KJS::Value();
 
-    const TQMimeSource * arg0; // Dummy
+    const TTQMimeSource * arg0; // Dummy
 
       bool ret;
       ret = instance->acceptDrop(
@@ -1313,7 +1313,7 @@ KJS::Value QListViewItemImp::acceptDrop_53( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QListViewItemImp::setVisible_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setVisible_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -1324,7 +1324,7 @@ KJS::Value QListViewItemImp::setVisible_54( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QListViewItemImp::isVisible_55( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::isVisible_55( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -1333,7 +1333,7 @@ KJS::Value QListViewItemImp::isVisible_55( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QListViewItemImp::setRenameEnabled_56( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setRenameEnabled_56( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1347,7 +1347,7 @@ KJS::Value QListViewItemImp::setRenameEnabled_56( KJS::ExecState *exec, KJS::Obj
 
 }
 
-KJS::Value QListViewItemImp::renameEnabled_57( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::renameEnabled_57( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1359,7 +1359,7 @@ KJS::Value QListViewItemImp::renameEnabled_57( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QListViewItemImp::startRename_58( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::startRename_58( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1370,7 +1370,7 @@ KJS::Value QListViewItemImp::startRename_58( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QListViewItemImp::setEnabled_59( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setEnabled_59( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -1381,7 +1381,7 @@ KJS::Value QListViewItemImp::setEnabled_59( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QListViewItemImp::isEnabled_60( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::isEnabled_60( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -1390,7 +1390,7 @@ KJS::Value QListViewItemImp::isEnabled_60( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QListViewItemImp::rtti_61( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::rtti_61( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -1399,7 +1399,7 @@ KJS::Value QListViewItemImp::rtti_61( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QListViewItemImp::setMultiLinesEnabled_62( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::setMultiLinesEnabled_62( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -1410,7 +1410,7 @@ KJS::Value QListViewItemImp::setMultiLinesEnabled_62( KJS::ExecState *exec, KJS:
 
 }
 
-KJS::Value QListViewItemImp::multiLinesEnabled_63( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQListViewItemImp::multiLinesEnabled_63( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
diff --git a/kjsembed/qtbindings/qlistviewitem_imp.h b/kjsembed/qtbindings/qlistviewitem_imp.h
index 2f0eb21b..b4c7caa8 100644
--- a/kjsembed/qtbindings/qlistviewitem_imp.h
+++ b/kjsembed/qtbindings/qlistviewitem_imp.h
@@ -10,7 +10,7 @@
 #include <kjsembed/jsobjectproxy_imp.h>
 #include <kjsembed/jsbindingbase.h>
 
-class TQListViewItem;
+class TTQListViewItem;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -18,7 +18,7 @@ class TQListViewItem;
 namespace KJSEmbed {
 namespace Bindings {
 
-    class QListViewItemLoader : public JSBindingBase
+    class TQListViewItemLoader : public JSBindingBase
     {
         public:
             KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const;
@@ -26,11 +26,11 @@ namespace Bindings {
     };
 }
 /**
- * Wrapper class for TQListViewItem methods.
+ * Wrapper class for TTQListViewItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QListViewItemImp : public JSProxyImp
+class TQListViewItemImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -107,8 +107,8 @@ public:
        Method_Last = -1
    };
 
-   QListViewItemImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QListViewItemImp();
+   TQListViewItemImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQListViewItemImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -122,20 +122,20 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQListViewItem *toQListViewItem( KJS::Object &object );
+   static TTQListViewItem *toTQListViewItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QListViewItem_1( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QListViewItem_2( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QListViewItem_3( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QListViewItem_4( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QListViewItem_5( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QListViewItem_6( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QListViewItem_7( KJS::ExecState *exec, const KJS::List &args );
-   KJS::Object QListViewItem_8( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQListViewItem_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQListViewItem_2( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQListViewItem_3( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQListViewItem_4( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQListViewItem_5( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQListViewItem_6( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQListViewItem_7( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQListViewItem_8( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -213,7 +213,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQListViewItem *instance; // Temp
+   TTQListViewItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qmenudata_imp.cpp b/kjsembed/qtbindings/qmenudata_imp.cpp
index da91f8dd..925e4125 100644
--- a/kjsembed/qtbindings/qmenudata_imp.cpp
+++ b/kjsembed/qtbindings/qmenudata_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QMenuDataImp::QMenuDataImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQMenuDataImp::TQMenuDataImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QMenuDataImp::~QMenuDataImp()
+TTQMenuDataImp::~TQMenuDataImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QMenuDataImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQMenuDataImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QMenuDataImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QMenuDataImp *meth = new QMenuDataImp( exec, methods[idx].id );
+            TQMenuDataImp *meth = new TQMenuDataImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QMenuDataImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QMenuDataImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQMenuDataImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -121,11 +121,11 @@ void QMenuDataImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QMenuDataImp *meth = new QMenuDataImp( exec, methods[idx].id );
+            TQMenuDataImp *meth = new TQMenuDataImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -134,62 +134,62 @@ void QMenuDataImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQMenuData pointer from an Object.
+ * Extract a TTQMenuData pointer from an Object.
  */
-TQMenuData *QMenuDataImp::toQMenuData( KJS::Object &self )
+TTQMenuData *TQMenuDataImp::toTQMenuData( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQMenuData *>( obj );
+           return dynamic_cast<TTQMenuData *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQMenuData" )
+    if ( op->typeName() != "TTQMenuData" )
         return 0;
 
-    return op->toNative<TQMenuData>();
+    return op->toNative<TTQMenuData>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QMenuDataImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQMenuDataImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QMenuData_1:
-             return QMenuData_1( exec, args );
+             return TQMenuData_1( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QMenuDataCons has no constructor with id '%1'").arg(id);
+    TTQString msg = i18n("TQMenuDataCons has no constructor with id '%1'").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QMenuDataImp::QMenuData_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQMenuDataImp::TQMenuData_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
 
-    // We should now create an instance of the TQMenuData object
+    // We should now create an instance of the TTQMenuData object
 
-    TQMenuData *ret = new TQMenuData(
+    TTQMenuData *ret = new TTQMenuData(
         );
 
     return KJS::Object();
 }
 
-KJS::Value QMenuDataImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQMenuDataImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QMenuDataImp::toQMenuData( self );
+    instance = TQMenuDataImp::toTQMenuData( self );
 
     switch( id ) {
 
@@ -409,12 +409,12 @@ KJS::Value QMenuDataImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
         break;
     }
 
-    TQString msg = i18n( "QMenuDataImp has no method with id '%1'" ).arg( id );
+    TTQString msg = i18n( "TQMenuDataImp has no method with id '%1'" ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QMenuDataImp::count_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::count_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       uint ret;
@@ -423,22 +423,22 @@ KJS::Value QMenuDataImp::count_3( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QMenuDataImp::insertItem_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
-    // Unsupported parameter const TQObject *
+    // Unsupported parameter const TTQObject *
     return KJS::Value();
 
-    const TQObject * arg1; // Dummy
+    const TTQObject * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
-    // Unsupported parameter const QKeySequence
+    // Unsupported parameter const TQKeySequence
     return KJS::Value();
 
-    const TQKeySequence  arg3; // Dummy
+    const TTQKeySequence  arg3; // Dummy
 
     int arg4 = extractInt(exec, args, 4);
 
@@ -456,27 +456,27 @@ KJS::Value QMenuDataImp::insertItem_4( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QMenuDataImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QIconSet
+    // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TQIconSet arg0; // Dummy
+    const TTQIconSet arg0; // Dummy
 
-    TQString arg1 = extractQString(exec, args, 1);
+    TTQString arg1 = extractTQString(exec, args, 1);
 
-    // Unsupported parameter const TQObject *
+    // Unsupported parameter const TTQObject *
     return KJS::Value();
 
-    const TQObject * arg2; // Dummy
+    const TTQObject * arg2; // Dummy
 
     const char *arg3 = (args.size() >= 4) ? args[3].toString(exec).ascii() : 0;
 
-    // Unsupported parameter const QKeySequence
+    // Unsupported parameter const TQKeySequence
     return KJS::Value();
 
-    const TQKeySequence arg4; // Dummy
+    const TTQKeySequence arg4; // Dummy
 
     int arg5 = extractInt(exec, args, 5);
 
@@ -495,22 +495,22 @@ KJS::Value QMenuDataImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QMenuDataImp::insertItem_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPixmap arg0 = extractQPixmap(exec, args, 0);
+    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
-    // Unsupported parameter const TQObject *
+    // Unsupported parameter const TTQObject *
     return KJS::Value();
 
-    const TQObject * arg1; // Dummy
+    const TTQObject * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
-    // Unsupported parameter const QKeySequence
+    // Unsupported parameter const TQKeySequence
     return KJS::Value();
 
-    const TQKeySequence  arg3; // Dummy
+    const TTQKeySequence  arg3; // Dummy
 
     int arg4 = extractInt(exec, args, 4);
 
@@ -528,27 +528,27 @@ KJS::Value QMenuDataImp::insertItem_6( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QMenuDataImp::insertItem_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QIconSet
+    // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TQIconSet arg0; // Dummy
+    const TTQIconSet arg0; // Dummy
 
-    TQPixmap arg1 = extractQPixmap(exec, args, 1);
+    TTQPixmap arg1 = extractTQPixmap(exec, args, 1);
 
-    // Unsupported parameter const TQObject *
+    // Unsupported parameter const TTQObject *
     return KJS::Value();
 
-    const TQObject * arg2; // Dummy
+    const TTQObject * arg2; // Dummy
 
     const char *arg3 = (args.size() >= 4) ? args[3].toString(exec).ascii() : 0;
 
-    // Unsupported parameter const QKeySequence
+    // Unsupported parameter const TQKeySequence
     return KJS::Value();
 
-    const TQKeySequence arg4; // Dummy
+    const TTQKeySequence arg4; // Dummy
 
     int arg5 = extractInt(exec, args, 5);
 
@@ -567,10 +567,10 @@ KJS::Value QMenuDataImp::insertItem_7( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QMenuDataImp::insertItem_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -585,15 +585,15 @@ KJS::Value QMenuDataImp::insertItem_8( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QMenuDataImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QIconSet
+    // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TQIconSet arg0; // Dummy
+    const TTQIconSet arg0; // Dummy
 
-    TQString arg1 = extractQString(exec, args, 1);
+    TTQString arg1 = extractTQString(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -609,15 +609,15 @@ KJS::Value QMenuDataImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QMenuDataImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
-    // Unsupported parameter TQPopupMenu *
+    // Unsupported parameter TTQPopupMenu *
     return KJS::Value();
 
-    TQPopupMenu * arg1; // Dummy
+    TTQPopupMenu * arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -633,20 +633,20 @@ KJS::Value QMenuDataImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QIconSet
+    // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TQIconSet arg0; // Dummy
+    const TTQIconSet arg0; // Dummy
 
-    TQString arg1 = extractQString(exec, args, 1);
+    TTQString arg1 = extractTQString(exec, args, 1);
 
-    // Unsupported parameter TQPopupMenu *
+    // Unsupported parameter TTQPopupMenu *
     return KJS::Value();
 
-    TQPopupMenu * arg2; // Dummy
+    TTQPopupMenu * arg2; // Dummy
 
     int arg3 = extractInt(exec, args, 3);
 
@@ -663,10 +663,10 @@ KJS::Value QMenuDataImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::insertItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPixmap arg0 = extractQPixmap(exec, args, 0);
+    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -681,15 +681,15 @@ KJS::Value QMenuDataImp::insertItem_12( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::insertItem_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QIconSet
+    // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TQIconSet arg0; // Dummy
+    const TTQIconSet arg0; // Dummy
 
-    TQPixmap arg1 = extractQPixmap(exec, args, 1);
+    TTQPixmap arg1 = extractTQPixmap(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -705,15 +705,15 @@ KJS::Value QMenuDataImp::insertItem_13( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::insertItem_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPixmap arg0 = extractQPixmap(exec, args, 0);
+    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
-    // Unsupported parameter TQPopupMenu *
+    // Unsupported parameter TTQPopupMenu *
     return KJS::Value();
 
-    TQPopupMenu * arg1; // Dummy
+    TTQPopupMenu * arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -729,20 +729,20 @@ KJS::Value QMenuDataImp::insertItem_14( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::insertItem_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QIconSet
+    // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TQIconSet arg0; // Dummy
+    const TTQIconSet arg0; // Dummy
 
-    TQPixmap arg1 = extractQPixmap(exec, args, 1);
+    TTQPixmap arg1 = extractTQPixmap(exec, args, 1);
 
-    // Unsupported parameter TQPopupMenu *
+    // Unsupported parameter TTQPopupMenu *
     return KJS::Value();
 
-    TQPopupMenu * arg2; // Dummy
+    TTQPopupMenu * arg2; // Dummy
 
     int arg3 = extractInt(exec, args, 3);
 
@@ -759,13 +759,13 @@ KJS::Value QMenuDataImp::insertItem_15( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::insertItem_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQWidget *
+    // Unsupported parameter TTQWidget *
     return KJS::Value();
 
-    TQWidget * arg0; // Dummy
+    TTQWidget * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -780,18 +780,18 @@ KJS::Value QMenuDataImp::insertItem_16( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::insertItem_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QIconSet
+    // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TQIconSet arg0; // Dummy
+    const TTQIconSet arg0; // Dummy
 
-    // Unsupported parameter TQCustomMenuItem *
+    // Unsupported parameter TTQCustomMenuItem *
     return KJS::Value();
 
-    TQCustomMenuItem * arg1; // Dummy
+    TTQCustomMenuItem * arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -807,13 +807,13 @@ KJS::Value QMenuDataImp::insertItem_17( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::insertItem_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertItem_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQCustomMenuItem *
+    // Unsupported parameter TTQCustomMenuItem *
     return KJS::Value();
 
-    TQCustomMenuItem * arg0; // Dummy
+    TTQCustomMenuItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -828,7 +828,7 @@ KJS::Value QMenuDataImp::insertItem_18( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::insertSeparator_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::insertSeparator_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -840,7 +840,7 @@ KJS::Value QMenuDataImp::insertSeparator_19( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QMenuDataImp::removeItem_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::removeItem_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -851,7 +851,7 @@ KJS::Value QMenuDataImp::removeItem_20( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::removeItemAt_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::removeItemAt_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -862,7 +862,7 @@ KJS::Value QMenuDataImp::removeItemAt_21( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QMenuDataImp::clear_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::clear_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->clear(  );
@@ -870,24 +870,24 @@ KJS::Value QMenuDataImp::clear_22( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QMenuDataImp::accel_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::accel_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
       instance->accel(
        arg0 );
-      return KJS::Value(); // Returns 'QKeySequence'
+      return KJS::Value(); // Returns 'TQKeySequence'
 
 }
 
-KJS::Value QMenuDataImp::setAccel_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::setAccel_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QKeySequence
+    // Unsupported parameter const TQKeySequence
     return KJS::Value();
 
-    const TQKeySequence  arg0; // Dummy
+    const TTQKeySequence  arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -898,46 +898,46 @@ KJS::Value QMenuDataImp::setAccel_24( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QMenuDataImp::iconSet_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::iconSet_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
       instance->iconSet(
        arg0 );
-      return KJS::Value(); // Returns 'TQIconSet *'
+      return KJS::Value(); // Returns 'TTQIconSet *'
 
 }
 
-KJS::Value QMenuDataImp::text_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::text_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-      TQString ret;
+      TTQString ret;
       ret = instance->text(
        arg0 );
       return KJS::String( ret );
 
 }
 
-KJS::Value QMenuDataImp::pixmap_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::pixmap_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
       instance->pixmap(
        arg0 );
-      return KJS::Value(); // Returns 'TQPixmap *'
+      return KJS::Value(); // Returns 'TTQPixmap *'
 
 }
 
-KJS::Value QMenuDataImp::setWhatsThis_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::setWhatsThis_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-    TQString arg1 = extractQString(exec, args, 1);
+    TTQString arg1 = extractTQString(exec, args, 1);
 
       instance->setWhatsThis(
        arg0,
@@ -946,24 +946,24 @@ KJS::Value QMenuDataImp::setWhatsThis_28( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QMenuDataImp::whatsThis_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::whatsThis_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-      TQString ret;
+      TTQString ret;
       ret = instance->whatsThis(
        arg0 );
       return KJS::String( ret );
 
 }
 
-KJS::Value QMenuDataImp::changeItem_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::changeItem_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-    TQString arg1 = extractQString(exec, args, 1);
+    TTQString arg1 = extractTQString(exec, args, 1);
 
       instance->changeItem(
        arg0,
@@ -972,12 +972,12 @@ KJS::Value QMenuDataImp::changeItem_30( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::changeItem_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::changeItem_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-    TQPixmap arg1 = extractQPixmap(exec, args, 1);
+    TTQPixmap arg1 = extractTQPixmap(exec, args, 1);
 
       instance->changeItem(
        arg0,
@@ -986,17 +986,17 @@ KJS::Value QMenuDataImp::changeItem_31( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::changeItem_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::changeItem_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter const QIconSet
+    // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TQIconSet  arg1; // Dummy
+    const TTQIconSet  arg1; // Dummy
 
-    TQString arg2 = extractQString(exec, args, 2);
+    TTQString arg2 = extractTQString(exec, args, 2);
 
       instance->changeItem(
        arg0,
@@ -1006,17 +1006,17 @@ KJS::Value QMenuDataImp::changeItem_32( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::changeItem_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::changeItem_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter const QIconSet
+    // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TQIconSet  arg1; // Dummy
+    const TTQIconSet  arg1; // Dummy
 
-    TQPixmap arg2 = extractQPixmap(exec, args, 2);
+    TTQPixmap arg2 = extractTQPixmap(exec, args, 2);
 
       instance->changeItem(
        arg0,
@@ -1026,10 +1026,10 @@ KJS::Value QMenuDataImp::changeItem_33( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::changeItem_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::changeItem_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -1040,10 +1040,10 @@ KJS::Value QMenuDataImp::changeItem_34( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::changeItem_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::changeItem_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPixmap arg0 = extractQPixmap(exec, args, 0);
+    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -1054,15 +1054,15 @@ KJS::Value QMenuDataImp::changeItem_35( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::changeItem_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::changeItem_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QIconSet
+    // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TQIconSet arg0; // Dummy
+    const TTQIconSet arg0; // Dummy
 
-    TQString arg1 = extractQString(exec, args, 1);
+    TTQString arg1 = extractTQString(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -1074,7 +1074,7 @@ KJS::Value QMenuDataImp::changeItem_36( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::isItemActive_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::isItemActive_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1086,7 +1086,7 @@ KJS::Value QMenuDataImp::isItemActive_37( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QMenuDataImp::isItemEnabled_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::isItemEnabled_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1098,7 +1098,7 @@ KJS::Value QMenuDataImp::isItemEnabled_38( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QMenuDataImp::setItemEnabled_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::setItemEnabled_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1112,7 +1112,7 @@ KJS::Value QMenuDataImp::setItemEnabled_39( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QMenuDataImp::isItemChecked_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::isItemChecked_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1124,7 +1124,7 @@ KJS::Value QMenuDataImp::isItemChecked_40( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QMenuDataImp::setItemChecked_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::setItemChecked_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1138,7 +1138,7 @@ KJS::Value QMenuDataImp::setItemChecked_41( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QMenuDataImp::isItemVisible_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::isItemVisible_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1150,7 +1150,7 @@ KJS::Value QMenuDataImp::isItemVisible_42( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QMenuDataImp::setItemVisible_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::setItemVisible_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1164,7 +1164,7 @@ KJS::Value QMenuDataImp::setItemVisible_43( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QMenuDataImp::updateItem_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::updateItem_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1175,7 +1175,7 @@ KJS::Value QMenuDataImp::updateItem_44( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::indexOf_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::indexOf_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1187,7 +1187,7 @@ KJS::Value QMenuDataImp::indexOf_45( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QMenuDataImp::idAt_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::idAt_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1199,7 +1199,7 @@ KJS::Value QMenuDataImp::idAt_46( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QMenuDataImp::setId_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::setId_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1213,15 +1213,15 @@ KJS::Value QMenuDataImp::setId_47( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QMenuDataImp::connectItem_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::connectItem_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter const TQObject *
+    // Unsupported parameter const TTQObject *
     return KJS::Value();
 
-    const TQObject * arg1; // Dummy
+    const TTQObject * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
@@ -1234,15 +1234,15 @@ KJS::Value QMenuDataImp::connectItem_48( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuDataImp::disconnectItem_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::disconnectItem_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter const TQObject *
+    // Unsupported parameter const TTQObject *
     return KJS::Value();
 
-    const TQObject * arg1; // Dummy
+    const TTQObject * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
@@ -1255,7 +1255,7 @@ KJS::Value QMenuDataImp::disconnectItem_49( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QMenuDataImp::setItemParameter_50( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::setItemParameter_50( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1270,7 +1270,7 @@ KJS::Value QMenuDataImp::setItemParameter_50( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QMenuDataImp::itemParameter_51( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::itemParameter_51( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -1282,41 +1282,41 @@ KJS::Value QMenuDataImp::itemParameter_51( KJS::ExecState *exec, KJS::Object &ob
 
 }
 
-KJS::Value QMenuDataImp::findItem_52( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::findItem_52( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
       instance->findItem(
        arg0 );
-      return KJS::Value(); // Returns 'TQMenuItem *'
+      return KJS::Value(); // Returns 'TTQMenuItem *'
 
 }
 
-KJS::Value QMenuDataImp::findItem_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::findItem_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter TQMenuData **
+    // Unsupported parameter TTQMenuData **
     return KJS::Value();
 
-    TQMenuData ** arg1; // Dummy
+    TTQMenuData ** arg1; // Dummy
 
       instance->findItem(
        arg0,
        arg1 );
-      return KJS::Value(); // Returns 'TQMenuItem *'
+      return KJS::Value(); // Returns 'TTQMenuItem *'
 
 }
 
-KJS::Value QMenuDataImp::findPopup_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::findPopup_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TQPopupMenu *
+    // Unsupported parameter TTQPopupMenu *
     return KJS::Value();
 
-    TQPopupMenu * arg0; // Dummy
+    TTQPopupMenu * arg0; // Dummy
 
     // Unsupported parameter int *
     return KJS::Value();
@@ -1326,11 +1326,11 @@ KJS::Value QMenuDataImp::findPopup_54( KJS::ExecState *exec, KJS::Object &obj, c
       instance->findPopup(
        arg0,
        arg1 );
-      return KJS::Value(); // Returns 'TQMenuItem *'
+      return KJS::Value(); // Returns 'TTQMenuItem *'
 
 }
 
-KJS::Value QMenuDataImp::activateItemAt_55( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuDataImp::activateItemAt_55( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
diff --git a/kjsembed/qtbindings/qmenudata_imp.h b/kjsembed/qtbindings/qmenudata_imp.h
index 83f84aa5..6409dca6 100644
--- a/kjsembed/qtbindings/qmenudata_imp.h
+++ b/kjsembed/qtbindings/qmenudata_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQMenuData;
+class TTQMenuData;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQMenuData;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQMenuData methods.
+ * Wrapper class for TTQMenuData methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QMenuDataImp : public JSProxyImp
+class TQMenuDataImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -90,8 +90,8 @@ public:
        Method_Last = -1
    };
 
-   QMenuDataImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QMenuDataImp();
+   TQMenuDataImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQMenuDataImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -105,13 +105,13 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQMenuData *toQMenuData( KJS::Object &object );
+   static TTQMenuData *toTQMenuData( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QMenuData_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQMenuData_1( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -188,7 +188,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQMenuData *instance; // Temp
+   TTQMenuData *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qmenuitem_imp.cpp b/kjsembed/qtbindings/qmenuitem_imp.cpp
index c2be558c..75118e4e 100644
--- a/kjsembed/qtbindings/qmenuitem_imp.cpp
+++ b/kjsembed/qtbindings/qmenuitem_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QMenuItemImp::QMenuItemImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQMenuItemImp::TQMenuItemImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QMenuItemImp::~QMenuItemImp()
+TTQMenuItemImp::~TQMenuItemImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QMenuItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQMenuItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QMenuItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QMenuItemImp *meth = new QMenuItemImp( exec, methods[idx].id );
+            TQMenuItemImp *meth = new TQMenuItemImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QMenuItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QMenuItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQMenuItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
     { Method_id_3, "id" },
@@ -86,29 +86,29 @@ void QMenuItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     { 0, 0 }
     };
     
-    JSProxy::addMethods<QMenuItemImp>(exec, methods, object );
+    JSProxy::addMethods<TQMenuItemImp>(exec, methods, object );
 
 }
 
 /**
- * Extract a TQMenuItem pointer from an Object.
+ * Extract a TTQMenuItem pointer from an Object.
  */
-TQMenuItem *QMenuItemImp::toQMenuItem( KJS::Object &self )
+TTQMenuItem *TQMenuItemImp::toTQMenuItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
     if ( obj )
-           return dynamic_cast<TQMenuItem *>( obj );
+           return dynamic_cast<TTQMenuItem *>( obj );
     }
 
-    if( !JSProxy::checkType(self, JSProxy::ObjectProxy, "TQMenuItem") ) {
-        TQObject *obj = JSProxy::toObjectProxy( self.imp() )->object();
-        return dynamic_cast<TQMenuItem *>( obj );
+    if( !JSProxy::checkType(self, JSProxy::ObjectProxy, "TTQMenuItem") ) {
+        TTQObject *obj = JSProxy::toObjectProxy( self.imp() )->object();
+        return dynamic_cast<TTQMenuItem *>( obj );
     }
     
-    if( !JSProxy::checkType(self, JSProxy::OpaqueProxy, "TQMenuItem") ) {
-        return JSProxy::toOpaqueProxy( self.imp() )->toNative<TQMenuItem>();
+    if( !JSProxy::checkType(self, JSProxy::OpaqueProxy, "TTQMenuItem") ) {
+        return JSProxy::toOpaqueProxy( self.imp() )->toNative<TTQMenuItem>();
     }
     return 0;
     
@@ -117,38 +117,38 @@ TQMenuItem *QMenuItemImp::toQMenuItem( KJS::Object &self )
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QMenuItemImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQMenuItemImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QMenuItem_1:
-             return QMenuItem_1( exec, args );
+             return TQMenuItem_1( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QMenuItemCons has no constructor with id '%1'").arg(id);
+    TTQString msg = i18n("TQMenuItemCons has no constructor with id '%1'").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QMenuItemImp::QMenuItem_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQMenuItemImp::TQMenuItem_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
 
-    // We should now create an instance of the TQMenuItem object
+    // We should now create an instance of the TTQMenuItem object
 
-    TQMenuItem *ret = new TQMenuItem(
+    TTQMenuItem *ret = new TTQMenuItem(
         );
 
     return KJS::Object();
 }
 
-KJS::Value QMenuItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQMenuItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QMenuItemImp::toQMenuItem( self );
+    instance = TQMenuItemImp::toTQMenuItem( self );
 
     switch( id ) {
 
@@ -236,12 +236,12 @@ KJS::Value QMenuItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
         break;
     }
 
-    TQString msg = i18n( "QMenuItemImp has no method with id '%1'" ).arg( id );
+    TTQString msg = i18n( "TQMenuItemImp has no method with id '%1'" ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QMenuItemImp::id_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::id_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -250,79 +250,79 @@ KJS::Value QMenuItemImp::id_3( KJS::ExecState *exec, KJS::Object &obj, const KJS
 
 }
 
-KJS::Value QMenuItemImp::iconSet_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::iconSet_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->iconSet(  );
-      return KJS::Value(); // Returns 'TQIconSet *'
+      return KJS::Value(); // Returns 'TTQIconSet *'
 
 }
 
-KJS::Value QMenuItemImp::text_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::text_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->text(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QMenuItemImp::whatsThis_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::whatsThis_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TQString ret;
+      TTQString ret;
       ret = instance->whatsThis(  );
       return KJS::String( ret );
 
 }
 
-KJS::Value QMenuItemImp::pixmap_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::pixmap_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     return convertToValue(exec, *instance->pixmap( ));
 
 }
 
-KJS::Value QMenuItemImp::popup_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::popup_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->popup(  );
-      return KJS::Value(); // Returns 'TQPopupMenu *'
+      return KJS::Value(); // Returns 'TTQPopupMenu *'
 
 }
 
-KJS::Value QMenuItemImp::widget_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::widget_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->widget(  );
-      return KJS::Value(); // Returns 'TQWidget *'
+      return KJS::Value(); // Returns 'TTQWidget *'
 
 }
 
-KJS::Value QMenuItemImp::custom_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::custom_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->custom(  );
-      return KJS::Value(); // Returns 'TQCustomMenuItem *'
+      return KJS::Value(); // Returns 'TTQCustomMenuItem *'
 
 }
 
-KJS::Value QMenuItemImp::key_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::key_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     return convertToValue( exec, instance->key(  ));
 
 }
 
-KJS::Value QMenuItemImp::signal_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::signal_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->signal(  );
-      return KJS::Value(); // Returns 'TQSignal *'
+      return KJS::Value(); // Returns 'TTQSignal *'
 
 }
 
-KJS::Value QMenuItemImp::isSeparator_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::isSeparator_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -331,7 +331,7 @@ KJS::Value QMenuItemImp::isSeparator_13( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuItemImp::isEnabled_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::isEnabled_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -340,7 +340,7 @@ KJS::Value QMenuItemImp::isEnabled_14( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QMenuItemImp::isChecked_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::isChecked_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -349,7 +349,7 @@ KJS::Value QMenuItemImp::isChecked_15( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QMenuItemImp::isDirty_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::isDirty_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -358,7 +358,7 @@ KJS::Value QMenuItemImp::isDirty_16( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QMenuItemImp::isVisible_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::isVisible_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -367,7 +367,7 @@ KJS::Value QMenuItemImp::isVisible_17( KJS::ExecState *exec, KJS::Object &obj, c
 
 }
 
-KJS::Value QMenuItemImp::isEnabledAndVisible_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::isEnabledAndVisible_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -376,10 +376,10 @@ KJS::Value QMenuItemImp::isEnabledAndVisible_18( KJS::ExecState *exec, KJS::Obje
 
 }
 
-KJS::Value QMenuItemImp::setText_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::setText_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
       instance->setText(
        arg0 );
@@ -387,7 +387,7 @@ KJS::Value QMenuItemImp::setText_19( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QMenuItemImp::setDirty_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::setDirty_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -398,7 +398,7 @@ KJS::Value QMenuItemImp::setDirty_20( KJS::ExecState *exec, KJS::Object &obj, co
 
 }
 
-KJS::Value QMenuItemImp::setVisible_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::setVisible_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -409,10 +409,10 @@ KJS::Value QMenuItemImp::setVisible_21( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QMenuItemImp::setWhatsThis_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQMenuItemImp::setWhatsThis_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQString arg0 = extractQString(exec, args, 0);
+    TTQString arg0 = extractTQString(exec, args, 0);
 
       instance->setWhatsThis(
        arg0 );
diff --git a/kjsembed/qtbindings/qmenuitem_imp.h b/kjsembed/qtbindings/qmenuitem_imp.h
index 59b7d996..ad1e480b 100644
--- a/kjsembed/qtbindings/qmenuitem_imp.h
+++ b/kjsembed/qtbindings/qmenuitem_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQMenuItem;
+class TTQMenuItem;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQMenuItem;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQMenuItem methods.
+ * Wrapper class for TTQMenuItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QMenuItemImp : public JSProxyImp
+class TQMenuItemImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -57,8 +57,8 @@ public:
        Method_Last = -1
    };
 
-   QMenuItemImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QMenuItemImp();
+   TQMenuItemImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQMenuItemImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -72,13 +72,13 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQMenuItem *toQMenuItem( KJS::Object &object );
+   static TTQMenuItem *toTQMenuItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QMenuItem_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQMenuItem_1( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -122,7 +122,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQMenuItem *instance; // Temp
+   TTQMenuItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qpopupmenu_imp.cpp b/kjsembed/qtbindings/qpopupmenu_imp.cpp
index 7b652422..f11c9a3b 100644
--- a/kjsembed/qtbindings/qpopupmenu_imp.cpp
+++ b/kjsembed/qtbindings/qpopupmenu_imp.cpp
@@ -23,19 +23,19 @@
  */
 namespace KJSEmbed {
 
-QPopupMenuImp::QPopupMenuImp( KJS::ExecState *exec, int mid, bool constructor )
+TTQPopupMenuImp::TQPopupMenuImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-QPopupMenuImp::~QPopupMenuImp()
+TTQPopupMenuImp::~TQPopupMenuImp()
 {
 }
 
 /**
  * Adds bindings for static methods and enum constants to the specified Object.
  */
-void QPopupMenuImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQPopupMenuImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -43,11 +43,11 @@ void QPopupMenuImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QPopupMenuImp *meth = new QPopupMenuImp( exec, methods[idx].id );
+            TQPopupMenuImp *meth = new TQPopupMenuImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -60,7 +60,7 @@ void QPopupMenuImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
 /**
  * Adds bindings for instance methods to the specified Object.
  */
-void QPopupMenuImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
+void TQPopupMenuImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 {
     JSProxy::MethodTable methods[] = {
 
@@ -85,11 +85,11 @@ void QPopupMenuImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
-            QPopupMenuImp *meth = new QPopupMenuImp( exec, methods[idx].id );
+            TQPopupMenuImp *meth = new TQPopupMenuImp( exec, methods[idx].id );
             object.put( exec , methods[idx].name, KJS::Object(meth) );
             lastName = methods[idx].name;
         }
@@ -98,61 +98,61 @@ void QPopupMenuImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TQPopupMenu pointer from an Object.
+ * Extract a TTQPopupMenu pointer from an Object.
  */
-TQPopupMenu *QPopupMenuImp::toQPopupMenu( KJS::Object &self )
+TTQPopupMenu *TQPopupMenuImp::toTQPopupMenu( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<TQPopupMenu *>( obj );
+           return dynamic_cast<TTQPopupMenu *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TQPopupMenu" )
+    if ( op->typeName() != "TTQPopupMenu" )
         return 0;
 
-    return op->toNative<TQPopupMenu>();
+    return op->toNative<TTQPopupMenu>();
 }
 
 /**
  * Select and invoke the correct constructor.
  */
-KJS::Object QPopupMenuImp::construct( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQPopupMenuImp::construct( KJS::ExecState *exec, const KJS::List &args )
 {
    switch( id ) {
 
          case Constructor_QPopupMenu_1:
-             return QPopupMenu_1( exec, args );
+             return TQPopupMenu_1( exec, args );
              break;
 
          default:
              break;
     }
 
-    TQString msg = i18n("QPopupMenuCons has no constructor with id '%1'").arg(id);
+    TTQString msg = i18n("TQPopupMenuCons has no constructor with id '%1'").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Object QPopupMenuImp::QPopupMenu_1( KJS::ExecState *exec, const KJS::List &args )
+KJS::Object TQPopupMenuImp::TQPopupMenu_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TQWidget *
+    // Unsupported parameter TTQWidget *
     return KJS::Object();
 
-    TQWidget * arg0; // Dummy
+    TTQWidget * arg0; // Dummy
 
     const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0;
 
 
-    // We should now create an instance of the TQPopupMenu object
+    // We should now create an instance of the TTQPopupMenu object
 
-    TQPopupMenu *ret = new TQPopupMenu(
+    TTQPopupMenu *ret = new TTQPopupMenu(
 
           arg0,
           arg1 );
@@ -160,9 +160,9 @@ KJS::Object QPopupMenuImp::QPopupMenu_1( KJS::ExecState *exec, const KJS::List &
 
 }
 
-KJS::Value QPopupMenuImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
+KJS::Value TQPopupMenuImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    instance = QPopupMenuImp::toQPopupMenu( self );
+    instance = TQPopupMenuImp::toTQPopupMenu( self );
 
     switch( id ) {
 
@@ -238,15 +238,15 @@ KJS::Value QPopupMenuImp::call( KJS::ExecState *exec, KJS::Object &self, const K
         break;
     }
 
-    TQString msg = i18n( "QPopupMenuImp has no method with id '%1'" ).arg( id );
+    TTQString msg = i18n( "TQPopupMenuImp has no method with id '%1'" ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
 
-KJS::Value QPopupMenuImp::popup_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::popup_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPoint arg0 = extractQPoint(exec, args, 0);
+    TTQPoint arg0 = extractTQPoint(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -257,7 +257,7 @@ KJS::Value QPopupMenuImp::popup_3( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QPopupMenuImp::updateItem_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::updateItem_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -268,7 +268,7 @@ KJS::Value QPopupMenuImp::updateItem_4( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QPopupMenuImp::setCheckable_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::setCheckable_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     bool arg0 = extractBool(exec, args, 0);
@@ -279,7 +279,7 @@ KJS::Value QPopupMenuImp::setCheckable_5( KJS::ExecState *exec, KJS::Object &obj
 
 }
 
-KJS::Value QPopupMenuImp::isCheckable_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::isCheckable_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -288,10 +288,10 @@ KJS::Value QPopupMenuImp::isCheckable_6( KJS::ExecState *exec, KJS::Object &obj,
 
 }
 
-KJS::Value QPopupMenuImp::setFont_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::setFont_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQFont arg0 = extractQFont(exec, args, 0);
+    TTQFont arg0 = extractTQFont(exec, args, 0);
 
       instance->setFont(
        arg0 );
@@ -299,7 +299,7 @@ KJS::Value QPopupMenuImp::setFont_7( KJS::ExecState *exec, KJS::Object &obj, con
 
 }
 
-KJS::Value QPopupMenuImp::show_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::show_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->show(  );
@@ -307,7 +307,7 @@ KJS::Value QPopupMenuImp::show_8( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QPopupMenuImp::hide_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::hide_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       instance->hide(  );
@@ -315,7 +315,7 @@ KJS::Value QPopupMenuImp::hide_9( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QPopupMenuImp::exec_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::exec_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       int ret;
@@ -324,10 +324,10 @@ KJS::Value QPopupMenuImp::exec_10( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QPopupMenuImp::exec_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::exec_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPoint arg0 = extractQPoint(exec, args, 0);
+    TTQPoint arg0 = extractTQPoint(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -339,7 +339,7 @@ KJS::Value QPopupMenuImp::exec_11( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QPopupMenuImp::setActiveItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::setActiveItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -350,16 +350,16 @@ KJS::Value QPopupMenuImp::setActiveItem_12( KJS::ExecState *exec, KJS::Object &o
 
 }
 
-KJS::Value QPopupMenuImp::sizeHint_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::sizeHint_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TQSize ret;
+    TTQSize ret;
       ret = instance->sizeHint(  );
 
        return convertToValue( exec, ret );
 
 }
 
-KJS::Value QPopupMenuImp::idAt_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::idAt_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -371,10 +371,10 @@ KJS::Value QPopupMenuImp::idAt_14( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QPopupMenuImp::idAt_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::idAt_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TQPoint arg0 = extractQPoint(exec, args, 0);
+    TTQPoint arg0 = extractTQPoint(exec, args, 0);
 
       int ret;
       ret = instance->idAt(
@@ -383,7 +383,7 @@ KJS::Value QPopupMenuImp::idAt_15( KJS::ExecState *exec, KJS::Object &obj, const
 
 }
 
-KJS::Value QPopupMenuImp::customWhatsThis_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::customWhatsThis_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
       bool ret;
@@ -392,7 +392,7 @@ KJS::Value QPopupMenuImp::customWhatsThis_16( KJS::ExecState *exec, KJS::Object
 
 }
 
-KJS::Value QPopupMenuImp::insertTearOffHandle_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::insertTearOffHandle_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -407,7 +407,7 @@ KJS::Value QPopupMenuImp::insertTearOffHandle_17( KJS::ExecState *exec, KJS::Obj
 
 }
 
-KJS::Value QPopupMenuImp::activateItemAt_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::activateItemAt_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
@@ -418,11 +418,11 @@ KJS::Value QPopupMenuImp::activateItemAt_18( KJS::ExecState *exec, KJS::Object &
 
 }
 
-KJS::Value QPopupMenuImp::itemGeometry_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
+KJS::Value TQPopupMenuImp::itemGeometry_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
     int arg0 = extractInt(exec, args, 0);
-        TQRect ret;
+        TTQRect ret;
       ret = instance->itemGeometry(
        arg0 );
 
diff --git a/kjsembed/qtbindings/qpopupmenu_imp.h b/kjsembed/qtbindings/qpopupmenu_imp.h
index 3a0c019d..38e1bdfc 100644
--- a/kjsembed/qtbindings/qpopupmenu_imp.h
+++ b/kjsembed/qtbindings/qpopupmenu_imp.h
@@ -9,7 +9,7 @@
 
 #include <kjsembed/jsobjectproxy_imp.h>
 
-class TQPopupMenu;
+class TTQPopupMenu;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,11 +17,11 @@ class TQPopupMenu;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TQPopupMenu methods.
+ * Wrapper class for TTQPopupMenu methods.
  *
  * @author Richard Moore, rich@kde.org
  */
-class QPopupMenuImp : public JSProxyImp
+class TQPopupMenuImp : public JSProxyImp
 {
 public:
    /** Enumerates the constructors supported by this class. */
@@ -54,8 +54,8 @@ public:
        Method_Last = -1
    };
 
-   QPopupMenuImp( KJS::ExecState *exec, int id, bool constructor=false );
-   ~QPopupMenuImp();
+   TQPopupMenuImp( KJS::ExecState *exec, int id, bool constructor=false );
+   ~TQPopupMenuImp();
 
    /**
     * Adds the static bindings for this class to the specified Object. The
@@ -69,13 +69,13 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TQPopupMenu *toQPopupMenu( KJS::Object &object );
+   static TTQPopupMenu *toTQPopupMenu( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
    //
 
-   KJS::Object QPopupMenu_1( KJS::ExecState *exec, const KJS::List &args );
+   KJS::Object TQPopupMenu_1( KJS::ExecState *exec, const KJS::List &args );
 
    //
    // Methods implemented by this class.
@@ -116,7 +116,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TQPopupMenu *instance; // Temp
+   TTQPopupMenu *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qt_imp.cpp b/kjsembed/qtbindings/qt_imp.cpp
index 99cae783..bd3fcf2f 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;
-    TQCString lastName;
+    TTQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -64,625 +64,625 @@ void QtImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
     EnumValue enums[] = {
 
         // enum ButtonState
-        { "NoButton", Qt::NoButton },
-        { "LeftButton", Qt::LeftButton },
-        { "RightButton", Qt::RightButton },
-        { "MidButton", Qt::MidButton },
-        { "MouseButtonMask", Qt::MouseButtonMask },
-        { "ShiftButton", Qt::ShiftButton },
-        { "ControlButton", Qt::ControlButton },
-        { "AltButton", Qt::AltButton },
-        { "MetaButton", Qt::MetaButton },
-        { "KeyButtonMask", Qt::KeyButtonMask },
-        { "Keypad", Qt::Keypad },
+        { "NoButton", TQt::NoButton },
+        { "LeftButton", TQt::LeftButton },
+        { "RightButton", TQt::RightButton },
+        { "MidButton", TQt::MidButton },
+        { "MouseButtonMask", TQt::MouseButtonMask },
+        { "ShiftButton", TQt::ShiftButton },
+        { "ControlButton", TQt::ControlButton },
+        { "AltButton", TQt::AltButton },
+        { "MetaButton", TQt::MetaButton },
+        { "KeyButtonMask", TQt::KeyButtonMask },
+        { "Keypad", TQt::Keypad },
         // enum Orientation
-        { "Horizontal", Qt::Horizontal },
-        { "Vertical", Qt::Vertical },
+        { "Horizontal", TQt::Horizontal },
+        { "Vertical", TQt::Vertical },
         // enum SortOrder
-        { "Ascending", Qt::Ascending },
-        { "Descending", Qt::Descending },
+        { "Ascending", TQt::Ascending },
+        { "Descending", TQt::Descending },
         // enum AlignmentFlags
-        { "AlignAuto", Qt::AlignAuto },
-        { "AlignLeft", Qt::AlignLeft },
-        { "AlignRight", Qt::AlignRight },
-        { "AlignHCenter", Qt::AlignHCenter },
-        { "AlignJustify", Qt::AlignJustify },
-        { "AlignHorizontal_Mask", Qt::AlignHorizontal_Mask },
-        { "AlignTop", Qt::AlignTop },
-        { "AlignBottom", Qt::AlignBottom },
-        { "AlignVCenter", Qt::AlignVCenter },
-        { "AlignVertical_Mask", Qt::AlignVertical_Mask },
-        { "AlignCenter", Qt::AlignCenter },
+        { "AlignAuto", TQt::AlignAuto },
+        { "AlignLeft", TQt::AlignLeft },
+        { "AlignRight", TQt::AlignRight },
+        { "AlignHCenter", TQt::AlignHCenter },
+        { "AlignJustify", TQt::AlignJustify },
+        { "AlignHorizontal_Mask", TQt::AlignHorizontal_Mask },
+        { "AlignTop", TQt::AlignTop },
+        { "AlignBottom", TQt::AlignBottom },
+        { "AlignVCenter", TQt::AlignVCenter },
+        { "AlignVertical_Mask", TQt::AlignVertical_Mask },
+        { "AlignCenter", TQt::AlignCenter },
         // enum TextFlags
-        { "SingleLine", Qt::SingleLine },
-        { "DontClip", Qt::DontClip },
-        { "ExpandTabs", Qt::ExpandTabs },
-        { "ShowPrefix", Qt::ShowPrefix },
-        { "WordBreak", Qt::WordBreak },
-        { "BreakAnywhere", Qt::BreakAnywhere },
-        { "DontPrint", Qt::DontPrint },
-        { "Underline", Qt::Underline },
-        { "Overline", Qt::Overline },
-        { "StrikeOut", Qt::StrikeOut },
-        { "IncludeTrailingSpaces", Qt::IncludeTrailingSpaces },
-        { "NoAccel", Qt::NoAccel },
+        { "SingleLine", TQt::SingleLine },
+        { "DontClip", TQt::DontClip },
+        { "ExpandTabs", TQt::ExpandTabs },
+        { "ShowPrefix", TQt::ShowPrefix },
+        { "WordBreak", TQt::WordBreak },
+        { "BreakAnywhere", TQt::BreakAnywhere },
+        { "DontPrint", TQt::DontPrint },
+        { "Underline", TQt::Underline },
+        { "Overline", TQt::Overline },
+        { "StrikeOut", TQt::StrikeOut },
+        { "IncludeTrailingSpaces", TQt::IncludeTrailingSpaces },
+        { "NoAccel", TQt::NoAccel },
         // enum WidgetState
-        { "WState_Created", Qt::WState_Created },
-        { "WState_Disabled", Qt::WState_Disabled },
-        { "WState_Visible", Qt::WState_Visible },
-        { "WState_ForceHide", Qt::WState_ForceHide },
-        { "WState_OwnCursor", Qt::WState_OwnCursor },
-        { "WState_MouseTracking", Qt::WState_MouseTracking },
-        { "WState_CompressKeys", Qt::WState_CompressKeys },
-        { "WState_BlockUpdates", Qt::WState_BlockUpdates },
-        { "WState_InPaintEvent", Qt::WState_InPaintEvent },
-        { "WState_Reparented", Qt::WState_Reparented },
-        { "WState_ConfigPending", Qt::WState_ConfigPending },
-        { "WState_Resized", Qt::WState_Resized },
-        { "WState_AutoMask", Qt::WState_AutoMask },
-        { "WState_Polished", Qt::WState_Polished },
-        { "WState_DND", Qt::WState_DND },
-        { "WState_Reserved0", Qt::WState_Reserved0 },
-        { "WState_FullScreen", Qt::WState_FullScreen },
-        { "WState_OwnSizePolicy", Qt::WState_OwnSizePolicy },
-        { "WState_CreatedHidden", Qt::WState_CreatedHidden },
-        { "WState_Maximized", Qt::WState_Maximized },
-        { "WState_Minimized", Qt::WState_Minimized },
-        { "WState_ForceDisabled", Qt::WState_ForceDisabled },
-        { "WState_Exposed", Qt::WState_Exposed },
-        { "WState_HasMouse", Qt::WState_HasMouse },
+        { "WState_Created", TQt::WState_Created },
+        { "WState_Disabled", TQt::WState_Disabled },
+        { "WState_Visible", TQt::WState_Visible },
+        { "WState_ForceHide", TQt::WState_ForceHide },
+        { "WState_OwnCursor", TQt::WState_OwnCursor },
+        { "WState_MouseTracking", TQt::WState_MouseTracking },
+        { "WState_CompressKeys", TQt::WState_CompressKeys },
+        { "WState_BlockUpdates", TQt::WState_BlockUpdates },
+        { "WState_InPaintEvent", TQt::WState_InPaintEvent },
+        { "WState_Reparented", TQt::WState_Reparented },
+        { "WState_ConfigPending", TQt::WState_ConfigPending },
+        { "WState_Resized", TQt::WState_Resized },
+        { "WState_AutoMask", TQt::WState_AutoMask },
+        { "WState_Polished", TQt::WState_Polished },
+        { "WState_DND", TQt::WState_DND },
+        { "WState_Reserved0", TQt::WState_Reserved0 },
+        { "WState_FullScreen", TQt::WState_FullScreen },
+        { "WState_OwnSizePolicy", TQt::WState_OwnSizePolicy },
+        { "WState_CreatedHidden", TQt::WState_CreatedHidden },
+        { "WState_Maximized", TQt::WState_Maximized },
+        { "WState_Minimized", TQt::WState_Minimized },
+        { "WState_ForceDisabled", TQt::WState_ForceDisabled },
+        { "WState_Exposed", TQt::WState_Exposed },
+        { "WState_HasMouse", TQt::WState_HasMouse },
         // enum WidgetFlags
-        { "WType_TopLevel", Qt::WType_TopLevel },
-        { "WType_Dialog", Qt::WType_Dialog },
-        { "WType_Popup", Qt::WType_Popup },
-        { "WType_Desktop", Qt::WType_Desktop },
-        { "WType_Mask", Qt::WType_Mask },
-        { "WStyle_Customize", Qt::WStyle_Customize },
-        { "WStyle_NormalBorder", Qt::WStyle_NormalBorder },
-        { "WStyle_DialogBorder", Qt::WStyle_DialogBorder },
-        { "WStyle_NoBorder", Qt::WStyle_NoBorder },
-        { "WStyle_Title", Qt::WStyle_Title },
-        { "WStyle_SysMenu", Qt::WStyle_SysMenu },
-        { "WStyle_Minimize", Qt::WStyle_Minimize },
-        { "WStyle_Maximize", Qt::WStyle_Maximize },
-        { "WStyle_MinMax", Qt::WStyle_MinMax },
-        { "WStyle_Tool", Qt::WStyle_Tool },
-        { "WStyle_StaysOnTop", Qt::WStyle_StaysOnTop },
-        { "WStyle_ContextHelp", Qt::WStyle_ContextHelp },
-        { "WStyle_Reserved", Qt::WStyle_Reserved },
-        { "WStyle_Mask", Qt::WStyle_Mask },
-        { "WDestructiveClose", Qt::WDestructiveClose },
-        { "WPaintDesktop", Qt::WPaintDesktop },
-        { "WPaintUnclipped", Qt::WPaintUnclipped },
-        { "WPaintClever", Qt::WPaintClever },
-        { "WResizeNoErase", Qt::WResizeNoErase },
-        { "WMouseNoMask", Qt::WMouseNoMask },
-        { "WStaticContents", Qt::WStaticContents },
-        { "WRepaintNoErase", Qt::WRepaintNoErase },
-        { "WX11BypassWM", Qt::WX11BypassWM },
-        { "WWinOwnDC", Qt::WWinOwnDC },
-        { "WMacNoSheet", Qt::WMacNoSheet },
-        { "WMacDrawer", Qt::WMacDrawer },
-        { "WGroupLeader", Qt::WGroupLeader },
-        { "WShowModal", Qt::WShowModal },
-        { "WNoMousePropagation", Qt::WNoMousePropagation },
-        { "WSubWindow", Qt::WSubWindow },
-        { "WStyle_Splash", Qt::WStyle_Splash },
-        { "WNoAutoErase", Qt::WNoAutoErase },
-        { "WNorthWestGravity", Qt::WNorthWestGravity },
-        { "WType_Modal", Qt::WType_Modal },
-        { "WStyle_Dialog", Qt::WStyle_Dialog },
-        { "WStyle_NoBorderEx", Qt::WStyle_NoBorderEx },
+        { "WType_TopLevel", TQt::WType_TopLevel },
+        { "WType_Dialog", TQt::WType_Dialog },
+        { "WType_Popup", TQt::WType_Popup },
+        { "WType_Desktop", TQt::WType_Desktop },
+        { "WType_Mask", TQt::WType_Mask },
+        { "WStyle_Customize", TQt::WStyle_Customize },
+        { "WStyle_NormalBorder", TQt::WStyle_NormalBorder },
+        { "WStyle_DialogBorder", TQt::WStyle_DialogBorder },
+        { "WStyle_NoBorder", TQt::WStyle_NoBorder },
+        { "WStyle_Title", TQt::WStyle_Title },
+        { "WStyle_SysMenu", TQt::WStyle_SysMenu },
+        { "WStyle_Minimize", TQt::WStyle_Minimize },
+        { "WStyle_Maximize", TQt::WStyle_Maximize },
+        { "WStyle_MinMax", TQt::WStyle_MinMax },
+        { "WStyle_Tool", TQt::WStyle_Tool },
+        { "WStyle_StaysOnTop", TQt::WStyle_StaysOnTop },
+        { "WStyle_ContextHelp", TQt::WStyle_ContextHelp },
+        { "WStyle_Reserved", TQt::WStyle_Reserved },
+        { "WStyle_Mask", TQt::WStyle_Mask },
+        { "WDestructiveClose", TQt::WDestructiveClose },
+        { "WPaintDesktop", TQt::WPaintDesktop },
+        { "WPaintUnclipped", TQt::WPaintUnclipped },
+        { "WPaintClever", TQt::WPaintClever },
+        { "WResizeNoErase", TQt::WResizeNoErase },
+        { "WMouseNoMask", TQt::WMouseNoMask },
+        { "WStaticContents", TQt::WStaticContents },
+        { "WRepaintNoErase", TQt::WRepaintNoErase },
+        { "WX11BypassWM", TQt::WX11BypassWM },
+        { "WWinOwnDC", TQt::WWinOwnDC },
+        { "WMacNoSheet", TQt::WMacNoSheet },
+        { "WMacDrawer", TQt::WMacDrawer },
+        { "WGroupLeader", TQt::WGroupLeader },
+        { "WShowModal", TQt::WShowModal },
+        { "WNoMousePropagation", TQt::WNoMousePropagation },
+        { "WSubWindow", TQt::WSubWindow },
+        { "WStyle_Splash", TQt::WStyle_Splash },
+        { "WNoAutoErase", TQt::WNoAutoErase },
+        { "WNorthWestGravity", TQt::WNorthWestGravity },
+        { "WType_Modal", TQt::WType_Modal },
+        { "WStyle_Dialog", TQt::WStyle_Dialog },
+        { "WStyle_NoBorderEx", TQt::WStyle_NoBorderEx },
         // enum WindowState
-        { "WindowNoState", Qt::WindowNoState },
-        { "WindowMinimized", Qt::WindowMinimized },
-        { "WindowMaximized", Qt::WindowMaximized },
-        { "WindowFullScreen", Qt::WindowFullScreen },
-        { "WindowActive", Qt::WindowActive },
+        { "WindowNoState", TQt::WindowNoState },
+        { "WindowMinimized", TQt::WindowMinimized },
+        { "WindowMaximized", TQt::WindowMaximized },
+        { "WindowFullScreen", TQt::WindowFullScreen },
+        { "WindowActive", TQt::WindowActive },
         // enum ImageConversionFlags
-        { "ColorMode_Mask", Qt::ColorMode_Mask },
-        { "AutoColor", Qt::AutoColor },
-        { "ColorOnly", Qt::ColorOnly },
-        { "MonoOnly", Qt::MonoOnly },
-        { "AlphaDither_Mask", Qt::AlphaDither_Mask },
-        { "ThresholdAlphaDither", Qt::ThresholdAlphaDither },
-        { "OrderedAlphaDither", Qt::OrderedAlphaDither },
-        { "DiffuseAlphaDither", Qt::DiffuseAlphaDither },
-        { "NoAlpha", Qt::NoAlpha },
-        { "Dither_Mask", Qt::Dither_Mask },
-        { "DiffuseDither", Qt::DiffuseDither },
-        { "OrderedDither", Qt::OrderedDither },
-        { "ThresholdDither", Qt::ThresholdDither },
-        { "DitherMode_Mask", Qt::DitherMode_Mask },
-        { "AutoDither", Qt::AutoDither },
-        { "PreferDither", Qt::PreferDither },
-        { "AvoidDither", Qt::AvoidDither },
+        { "ColorMode_Mask", TQt::ColorMode_Mask },
+        { "AutoColor", TQt::AutoColor },
+        { "ColorOnly", TQt::ColorOnly },
+        { "MonoOnly", TQt::MonoOnly },
+        { "AlphaDither_Mask", TQt::AlphaDither_Mask },
+        { "ThresholdAlphaDither", TQt::ThresholdAlphaDither },
+        { "OrderedAlphaDither", TQt::OrderedAlphaDither },
+        { "DiffuseAlphaDither", TQt::DiffuseAlphaDither },
+        { "NoAlpha", TQt::NoAlpha },
+        { "Dither_Mask", TQt::Dither_Mask },
+        { "DiffuseDither", TQt::DiffuseDither },
+        { "OrderedDither", TQt::OrderedDither },
+        { "ThresholdDither", TQt::ThresholdDither },
+        { "DitherMode_Mask", TQt::DitherMode_Mask },
+        { "AutoDither", TQt::AutoDither },
+        { "PreferDither", TQt::PreferDither },
+        { "AvoidDither", TQt::AvoidDither },
         // enum BGMode
-        { "TransparentMode", Qt::TransparentMode },
-        { "OpaqueMode", Qt::OpaqueMode },
+        { "TransparentMode", TQt::TransparentMode },
+        { "OpaqueMode", TQt::OpaqueMode },
         // enum PaintUnit
-        { "PixelUnit", Qt::PixelUnit },
-        { "LoMetricUnit", Qt::LoMetricUnit },
-        { "HiMetricUnit", Qt::HiMetricUnit },
-        { "LoEnglishUnit", Qt::LoEnglishUnit },
-        { "HiEnglishUnit", Qt::HiEnglishUnit },
-        { "TwipsUnit", Qt::TwipsUnit },
+        { "PixelUnit", TQt::PixelUnit },
+        { "LoMetricUnit", TQt::LoMetricUnit },
+        { "HiMetricUnit", TQt::HiMetricUnit },
+        { "LoEnglishUnit", TQt::LoEnglishUnit },
+        { "HiEnglishUnit", TQt::HiEnglishUnit },
+        { "TwipsUnit", TQt::TwipsUnit },
         // enum GUIStyle
-        { "MacStyle", Qt::MacStyle },
-        { "WindowsStyle", Qt::WindowsStyle },
-        { "Win3Style", Qt::Win3Style },
-        { "PMStyle", Qt::PMStyle },
-        { "MotifStyle", Qt::MotifStyle },
+        { "MacStyle", TQt::MacStyle },
+        { "WindowsStyle", TQt::WindowsStyle },
+        { "Win3Style", TQt::Win3Style },
+        { "PMStyle", TQt::PMStyle },
+        { "MotifStyle", TQt::MotifStyle },
         // enum SequenceMatch
-        { "NoMatch", Qt::NoMatch },
-        { "PartialMatch", Qt::PartialMatch },
-        { "Identical", Qt::Identical },
+        { "NoMatch", TQt::NoMatch },
+        { "PartialMatch", TQt::PartialMatch },
+        { "Identical", TQt::Identical },
         // enum Modifier
-        { "META", Qt::META },
-        { "SHIFT", Qt::SHIFT },
-        { "CTRL", Qt::CTRL },
-        { "ALT", Qt::ALT },
-        { "MODIFIER_MASK", Qt::MODIFIER_MASK },
-        { "UNICODE_ACCEL", Qt::UNICODE_ACCEL },
-        { "ASCII_ACCEL", Qt::ASCII_ACCEL },
+        { "META", TQt::META },
+        { "SHIFT", TQt::SHIFT },
+        { "CTRL", TQt::CTRL },
+        { "ALT", TQt::ALT },
+        { "MODIFIER_MASK", TQt::MODIFIER_MASK },
+        { "UNICODE_ACCEL", TQt::UNICODE_ACCEL },
+        { "ASCII_ACCEL", TQt::ASCII_ACCEL },
         // enum Key
-        { "Key_Escape", Qt::Key_Escape },
-        { "Key_Tab", Qt::Key_Tab },
-        { "Key_Backtab", Qt::Key_Backtab },
-        { "Key_BackTab", Qt::Key_BackTab },
-        { "Key_Backspace", Qt::Key_Backspace },
-        { "Key_BackSpace", Qt::Key_BackSpace },
-        { "Key_Return", Qt::Key_Return },
-        { "Key_Enter", Qt::Key_Enter },
-        { "Key_Insert", Qt::Key_Insert },
-        { "Key_Delete", Qt::Key_Delete },
-        { "Key_Pause", Qt::Key_Pause },
-        { "Key_Print", Qt::Key_Print },
-        { "Key_SysReq", Qt::Key_SysReq },
-        { "Key_Clear", Qt::Key_Clear },
-        { "Key_Home", Qt::Key_Home },
-        { "Key_End", Qt::Key_End },
-        { "Key_Left", Qt::Key_Left },
-        { "Key_Up", Qt::Key_Up },
-        { "Key_Right", Qt::Key_Right },
-        { "Key_Down", Qt::Key_Down },
-        { "Key_Prior", Qt::Key_Prior },
-        { "Key_PageUp", Qt::Key_PageUp },
-        { "Key_Next", Qt::Key_Next },
-        { "Key_PageDown", Qt::Key_PageDown },
-        { "Key_Shift", Qt::Key_Shift },
-        { "Key_Control", Qt::Key_Control },
-        { "Key_Meta", Qt::Key_Meta },
-        { "Key_Alt", Qt::Key_Alt },
-        { "Key_CapsLock", Qt::Key_CapsLock },
-        { "Key_NumLock", Qt::Key_NumLock },
-        { "Key_ScrollLock", Qt::Key_ScrollLock },
-        { "Key_F1", Qt::Key_F1 },
-        { "Key_F2", Qt::Key_F2 },
-        { "Key_F3", Qt::Key_F3 },
-        { "Key_F4", Qt::Key_F4 },
-        { "Key_F5", Qt::Key_F5 },
-        { "Key_F6", Qt::Key_F6 },
-        { "Key_F7", Qt::Key_F7 },
-        { "Key_F8", Qt::Key_F8 },
-        { "Key_F9", Qt::Key_F9 },
-        { "Key_F10", Qt::Key_F10 },
-        { "Key_F11", Qt::Key_F11 },
-        { "Key_F12", Qt::Key_F12 },
-        { "Key_F13", Qt::Key_F13 },
-        { "Key_F14", Qt::Key_F14 },
-        { "Key_F15", Qt::Key_F15 },
-        { "Key_F16", Qt::Key_F16 },
-        { "Key_F17", Qt::Key_F17 },
-        { "Key_F18", Qt::Key_F18 },
-        { "Key_F19", Qt::Key_F19 },
-        { "Key_F20", Qt::Key_F20 },
-        { "Key_F21", Qt::Key_F21 },
-        { "Key_F22", Qt::Key_F22 },
-        { "Key_F23", Qt::Key_F23 },
-        { "Key_F24", Qt::Key_F24 },
-        { "Key_F25", Qt::Key_F25 },
-        { "Key_F26", Qt::Key_F26 },
-        { "Key_F27", Qt::Key_F27 },
-        { "Key_F28", Qt::Key_F28 },
-        { "Key_F29", Qt::Key_F29 },
-        { "Key_F30", Qt::Key_F30 },
-        { "Key_F31", Qt::Key_F31 },
-        { "Key_F32", Qt::Key_F32 },
-        { "Key_F33", Qt::Key_F33 },
-        { "Key_F34", Qt::Key_F34 },
-        { "Key_F35", Qt::Key_F35 },
-        { "Key_Super_L", Qt::Key_Super_L },
-        { "Key_Super_R", Qt::Key_Super_R },
-        { "Key_Menu", Qt::Key_Menu },
-        { "Key_Hyper_L", Qt::Key_Hyper_L },
-        { "Key_Hyper_R", Qt::Key_Hyper_R },
-        { "Key_Help", Qt::Key_Help },
-        { "Key_Direction_L", Qt::Key_Direction_L },
-        { "Key_Direction_R", Qt::Key_Direction_R },
-        { "Key_Space", Qt::Key_Space },
-        { "Key_Any", Qt::Key_Any },
-        { "Key_Exclam", Qt::Key_Exclam },
-        { "Key_QuoteDbl", Qt::Key_QuoteDbl },
-        { "Key_NumberSign", Qt::Key_NumberSign },
-        { "Key_Dollar", Qt::Key_Dollar },
-        { "Key_Percent", Qt::Key_Percent },
-        { "Key_Ampersand", Qt::Key_Ampersand },
-        { "Key_Apostrophe", Qt::Key_Apostrophe },
-        { "Key_ParenLeft", Qt::Key_ParenLeft },
-        { "Key_ParenRight", Qt::Key_ParenRight },
-        { "Key_Asterisk", Qt::Key_Asterisk },
-        { "Key_Plus", Qt::Key_Plus },
-        { "Key_Comma", Qt::Key_Comma },
-        { "Key_Minus", Qt::Key_Minus },
-        { "Key_Period", Qt::Key_Period },
-        { "Key_Slash", Qt::Key_Slash },
-        { "Key_0", Qt::Key_0 },
-        { "Key_1", Qt::Key_1 },
-        { "Key_2", Qt::Key_2 },
-        { "Key_3", Qt::Key_3 },
-        { "Key_4", Qt::Key_4 },
-        { "Key_5", Qt::Key_5 },
-        { "Key_6", Qt::Key_6 },
-        { "Key_7", Qt::Key_7 },
-        { "Key_8", Qt::Key_8 },
-        { "Key_9", Qt::Key_9 },
-        { "Key_Colon", Qt::Key_Colon },
-        { "Key_Semicolon", Qt::Key_Semicolon },
-        { "Key_Less", Qt::Key_Less },
-        { "Key_Equal", Qt::Key_Equal },
-        { "Key_Greater", Qt::Key_Greater },
-        { "Key_Question", Qt::Key_Question },
-        { "Key_At", Qt::Key_At },
-        { "Key_A", Qt::Key_A },
-        { "Key_B", Qt::Key_B },
-        { "Key_C", Qt::Key_C },
-        { "Key_D", Qt::Key_D },
-        { "Key_E", Qt::Key_E },
-        { "Key_F", Qt::Key_F },
-        { "Key_G", Qt::Key_G },
-        { "Key_H", Qt::Key_H },
-        { "Key_I", Qt::Key_I },
-        { "Key_J", Qt::Key_J },
-        { "Key_K", Qt::Key_K },
-        { "Key_L", Qt::Key_L },
-        { "Key_M", Qt::Key_M },
-        { "Key_N", Qt::Key_N },
-        { "Key_O", Qt::Key_O },
-        { "Key_P", Qt::Key_P },
-        { "Key_Q", Qt::Key_Q },
-        { "Key_R", Qt::Key_R },
-        { "Key_S", Qt::Key_S },
-        { "Key_T", Qt::Key_T },
-        { "Key_U", Qt::Key_U },
-        { "Key_V", Qt::Key_V },
-        { "Key_W", Qt::Key_W },
-        { "Key_X", Qt::Key_X },
-        { "Key_Y", Qt::Key_Y },
-        { "Key_Z", Qt::Key_Z },
-        { "Key_BracketLeft", Qt::Key_BracketLeft },
-        { "Key_Backslash", Qt::Key_Backslash },
-        { "Key_BracketRight", Qt::Key_BracketRight },
-        { "Key_AsciiCircum", Qt::Key_AsciiCircum },
-        { "Key_Underscore", Qt::Key_Underscore },
-        { "Key_QuoteLeft", Qt::Key_QuoteLeft },
-        { "Key_BraceLeft", Qt::Key_BraceLeft },
-        { "Key_Bar", Qt::Key_Bar },
-        { "Key_BraceRight", Qt::Key_BraceRight },
-        { "Key_AsciiTilde", Qt::Key_AsciiTilde },
-        { "Key_nobreakspace", Qt::Key_nobreakspace },
-        { "Key_exclamdown", Qt::Key_exclamdown },
-        { "Key_cent", Qt::Key_cent },
-        { "Key_sterling", Qt::Key_sterling },
-        { "Key_currency", Qt::Key_currency },
-        { "Key_yen", Qt::Key_yen },
-        { "Key_brokenbar", Qt::Key_brokenbar },
-        { "Key_section", Qt::Key_section },
-        { "Key_diaeresis", Qt::Key_diaeresis },
-        { "Key_copyright", Qt::Key_copyright },
-        { "Key_ordfeminine", Qt::Key_ordfeminine },
-        { "Key_guillemotleft", Qt::Key_guillemotleft },
-        { "Key_notsign", Qt::Key_notsign },
-        { "Key_hyphen", Qt::Key_hyphen },
-        { "Key_registered", Qt::Key_registered },
-        { "Key_macron", Qt::Key_macron },
-        { "Key_degree", Qt::Key_degree },
-        { "Key_plusminus", Qt::Key_plusminus },
-        { "Key_twosuperior", Qt::Key_twosuperior },
-        { "Key_threesuperior", Qt::Key_threesuperior },
-        { "Key_acute", Qt::Key_acute },
-        { "Key_mu", Qt::Key_mu },
-        { "Key_paragraph", Qt::Key_paragraph },
-        { "Key_periodcentered", Qt::Key_periodcentered },
-        { "Key_cedilla", Qt::Key_cedilla },
-        { "Key_onesuperior", Qt::Key_onesuperior },
-        { "Key_masculine", Qt::Key_masculine },
-        { "Key_guillemotright", Qt::Key_guillemotright },
-        { "Key_onequarter", Qt::Key_onequarter },
-        { "Key_onehalf", Qt::Key_onehalf },
-        { "Key_threequarters", Qt::Key_threequarters },
-        { "Key_questiondown", Qt::Key_questiondown },
-        { "Key_Agrave", Qt::Key_Agrave },
-        { "Key_Aacute", Qt::Key_Aacute },
-        { "Key_Acircumflex", Qt::Key_Acircumflex },
-        { "Key_Atilde", Qt::Key_Atilde },
-        { "Key_Adiaeresis", Qt::Key_Adiaeresis },
-        { "Key_Aring", Qt::Key_Aring },
-        { "Key_AE", Qt::Key_AE },
-        { "Key_Ccedilla", Qt::Key_Ccedilla },
-        { "Key_Egrave", Qt::Key_Egrave },
-        { "Key_Eacute", Qt::Key_Eacute },
-        { "Key_Ecircumflex", Qt::Key_Ecircumflex },
-        { "Key_Ediaeresis", Qt::Key_Ediaeresis },
-        { "Key_Igrave", Qt::Key_Igrave },
-        { "Key_Iacute", Qt::Key_Iacute },
-        { "Key_Icircumflex", Qt::Key_Icircumflex },
-        { "Key_Idiaeresis", Qt::Key_Idiaeresis },
-        { "Key_ETH", Qt::Key_ETH },
-        { "Key_Ntilde", Qt::Key_Ntilde },
-        { "Key_Ograve", Qt::Key_Ograve },
-        { "Key_Oacute", Qt::Key_Oacute },
-        { "Key_Ocircumflex", Qt::Key_Ocircumflex },
-        { "Key_Otilde", Qt::Key_Otilde },
-        { "Key_Odiaeresis", Qt::Key_Odiaeresis },
-        { "Key_multiply", Qt::Key_multiply },
-        { "Key_Ooblique", Qt::Key_Ooblique },
-        { "Key_Ugrave", Qt::Key_Ugrave },
-        { "Key_Uacute", Qt::Key_Uacute },
-        { "Key_Ucircumflex", Qt::Key_Ucircumflex },
-        { "Key_Udiaeresis", Qt::Key_Udiaeresis },
-        { "Key_Yacute", Qt::Key_Yacute },
-        { "Key_THORN", Qt::Key_THORN },
-        { "Key_ssharp", Qt::Key_ssharp },
-        { "Key_agrave", Qt::Key_agrave },
-        { "Key_aacute", Qt::Key_aacute },
-        { "Key_acircumflex", Qt::Key_acircumflex },
-        { "Key_atilde", Qt::Key_atilde },
-        { "Key_adiaeresis", Qt::Key_adiaeresis },
-        { "Key_aring", Qt::Key_aring },
-        { "Key_ae", Qt::Key_ae },
-        { "Key_ccedilla", Qt::Key_ccedilla },
-        { "Key_egrave", Qt::Key_egrave },
-        { "Key_eacute", Qt::Key_eacute },
-        { "Key_ecircumflex", Qt::Key_ecircumflex },
-        { "Key_ediaeresis", Qt::Key_ediaeresis },
-        { "Key_igrave", Qt::Key_igrave },
-        { "Key_iacute", Qt::Key_iacute },
-        { "Key_icircumflex", Qt::Key_icircumflex },
-        { "Key_idiaeresis", Qt::Key_idiaeresis },
-        { "Key_eth", Qt::Key_eth },
-        { "Key_ntilde", Qt::Key_ntilde },
-        { "Key_ograve", Qt::Key_ograve },
-        { "Key_oacute", Qt::Key_oacute },
-        { "Key_ocircumflex", Qt::Key_ocircumflex },
-        { "Key_otilde", Qt::Key_otilde },
-        { "Key_odiaeresis", Qt::Key_odiaeresis },
-        { "Key_division", Qt::Key_division },
-        { "Key_oslash", Qt::Key_oslash },
-        { "Key_ugrave", Qt::Key_ugrave },
-        { "Key_uacute", Qt::Key_uacute },
-        { "Key_ucircumflex", Qt::Key_ucircumflex },
-        { "Key_udiaeresis", Qt::Key_udiaeresis },
-        { "Key_yacute", Qt::Key_yacute },
-        { "Key_thorn", Qt::Key_thorn },
-        { "Key_ydiaeresis", Qt::Key_ydiaeresis },
-        { "Key_Back", Qt::Key_Back },
-        { "Key_Forward", Qt::Key_Forward },
-        { "Key_Stop", Qt::Key_Stop },
-        { "Key_Refresh", Qt::Key_Refresh },
-        { "Key_VolumeDown", Qt::Key_VolumeDown },
-        { "Key_VolumeMute", Qt::Key_VolumeMute },
-        { "Key_VolumeUp", Qt::Key_VolumeUp },
-        { "Key_BassBoost", Qt::Key_BassBoost },
-        { "Key_BassUp", Qt::Key_BassUp },
-        { "Key_BassDown", Qt::Key_BassDown },
-        { "Key_TrebleUp", Qt::Key_TrebleUp },
-        { "Key_TrebleDown", Qt::Key_TrebleDown },
-        { "Key_MediaPlay", Qt::Key_MediaPlay },
-        { "Key_MediaStop", Qt::Key_MediaStop },
-        { "Key_MediaPrev", Qt::Key_MediaPrev },
-        { "Key_MediaNext", Qt::Key_MediaNext },
-        { "Key_MediaRecord", Qt::Key_MediaRecord },
-        { "Key_HomePage", Qt::Key_HomePage },
-        { "Key_Favorites", Qt::Key_Favorites },
-        { "Key_Search", Qt::Key_Search },
-        { "Key_Standby", Qt::Key_Standby },
-        { "Key_OpenUrl", Qt::Key_OpenUrl },
-        { "Key_LaunchMail", Qt::Key_LaunchMail },
-        { "Key_LaunchMedia", Qt::Key_LaunchMedia },
-        { "Key_Launch0", Qt::Key_Launch0 },
-        { "Key_Launch1", Qt::Key_Launch1 },
-        { "Key_Launch2", Qt::Key_Launch2 },
-        { "Key_Launch3", Qt::Key_Launch3 },
-        { "Key_Launch4", Qt::Key_Launch4 },
-        { "Key_Launch5", Qt::Key_Launch5 },
-        { "Key_Launch6", Qt::Key_Launch6 },
-        { "Key_Launch7", Qt::Key_Launch7 },
-        { "Key_Launch8", Qt::Key_Launch8 },
-        { "Key_Launch9", Qt::Key_Launch9 },
-        { "Key_LaunchA", Qt::Key_LaunchA },
-        { "Key_LaunchB", Qt::Key_LaunchB },
-        { "Key_LaunchC", Qt::Key_LaunchC },
-        { "Key_LaunchD", Qt::Key_LaunchD },
-        { "Key_LaunchE", Qt::Key_LaunchE },
-        { "Key_LaunchF", Qt::Key_LaunchF },
-        { "Key_MediaLast", Qt::Key_MediaLast },
-        { "Key_unknown", Qt::Key_unknown },
+        { "Key_Escape", TQt::Key_Escape },
+        { "Key_Tab", TQt::Key_Tab },
+        { "Key_Backtab", TQt::Key_Backtab },
+        { "Key_BackTab", TQt::Key_BackTab },
+        { "Key_Backspace", TQt::Key_Backspace },
+        { "Key_BackSpace", TQt::Key_BackSpace },
+        { "Key_Return", TQt::Key_Return },
+        { "Key_Enter", TQt::Key_Enter },
+        { "Key_Insert", TQt::Key_Insert },
+        { "Key_Delete", TQt::Key_Delete },
+        { "Key_Pause", TQt::Key_Pause },
+        { "Key_Print", TQt::Key_Print },
+        { "Key_SysReq", TQt::Key_SysReq },
+        { "Key_Clear", TQt::Key_Clear },
+        { "Key_Home", TQt::Key_Home },
+        { "Key_End", TQt::Key_End },
+        { "Key_Left", TQt::Key_Left },
+        { "Key_Up", TQt::Key_Up },
+        { "Key_Right", TQt::Key_Right },
+        { "Key_Down", TQt::Key_Down },
+        { "Key_Prior", TQt::Key_Prior },
+        { "Key_PageUp", TQt::Key_PageUp },
+        { "Key_Next", TQt::Key_Next },
+        { "Key_PageDown", TQt::Key_PageDown },
+        { "Key_Shift", TQt::Key_Shift },
+        { "Key_Control", TQt::Key_Control },
+        { "Key_Meta", TQt::Key_Meta },
+        { "Key_Alt", TQt::Key_Alt },
+        { "Key_CapsLock", TQt::Key_CapsLock },
+        { "Key_NumLock", TQt::Key_NumLock },
+        { "Key_ScrollLock", TQt::Key_ScrollLock },
+        { "Key_F1", TQt::Key_F1 },
+        { "Key_F2", TQt::Key_F2 },
+        { "Key_F3", TQt::Key_F3 },
+        { "Key_F4", TQt::Key_F4 },
+        { "Key_F5", TQt::Key_F5 },
+        { "Key_F6", TQt::Key_F6 },
+        { "Key_F7", TQt::Key_F7 },
+        { "Key_F8", TQt::Key_F8 },
+        { "Key_F9", TQt::Key_F9 },
+        { "Key_F10", TQt::Key_F10 },
+        { "Key_F11", TQt::Key_F11 },
+        { "Key_F12", TQt::Key_F12 },
+        { "Key_F13", TQt::Key_F13 },
+        { "Key_F14", TQt::Key_F14 },
+        { "Key_F15", TQt::Key_F15 },
+        { "Key_F16", TQt::Key_F16 },
+        { "Key_F17", TQt::Key_F17 },
+        { "Key_F18", TQt::Key_F18 },
+        { "Key_F19", TQt::Key_F19 },
+        { "Key_F20", TQt::Key_F20 },
+        { "Key_F21", TQt::Key_F21 },
+        { "Key_F22", TQt::Key_F22 },
+        { "Key_F23", TQt::Key_F23 },
+        { "Key_F24", TQt::Key_F24 },
+        { "Key_F25", TQt::Key_F25 },
+        { "Key_F26", TQt::Key_F26 },
+        { "Key_F27", TQt::Key_F27 },
+        { "Key_F28", TQt::Key_F28 },
+        { "Key_F29", TQt::Key_F29 },
+        { "Key_F30", TQt::Key_F30 },
+        { "Key_F31", TQt::Key_F31 },
+        { "Key_F32", TQt::Key_F32 },
+        { "Key_F33", TQt::Key_F33 },
+        { "Key_F34", TQt::Key_F34 },
+        { "Key_F35", TQt::Key_F35 },
+        { "Key_Super_L", TQt::Key_Super_L },
+        { "Key_Super_R", TQt::Key_Super_R },
+        { "Key_Menu", TQt::Key_Menu },
+        { "Key_Hyper_L", TQt::Key_Hyper_L },
+        { "Key_Hyper_R", TQt::Key_Hyper_R },
+        { "Key_Help", TQt::Key_Help },
+        { "Key_Direction_L", TQt::Key_Direction_L },
+        { "Key_Direction_R", TQt::Key_Direction_R },
+        { "Key_Space", TQt::Key_Space },
+        { "Key_Any", TQt::Key_Any },
+        { "Key_Exclam", TQt::Key_Exclam },
+        { "Key_QuoteDbl", TQt::Key_QuoteDbl },
+        { "Key_NumberSign", TQt::Key_NumberSign },
+        { "Key_Dollar", TQt::Key_Dollar },
+        { "Key_Percent", TQt::Key_Percent },
+        { "Key_Ampersand", TQt::Key_Ampersand },
+        { "Key_Apostrophe", TQt::Key_Apostrophe },
+        { "Key_ParenLeft", TQt::Key_ParenLeft },
+        { "Key_ParenRight", TQt::Key_ParenRight },
+        { "Key_Asterisk", TQt::Key_Asterisk },
+        { "Key_Plus", TQt::Key_Plus },
+        { "Key_Comma", TQt::Key_Comma },
+        { "Key_Minus", TQt::Key_Minus },
+        { "Key_Period", TQt::Key_Period },
+        { "Key_Slash", TQt::Key_Slash },
+        { "Key_0", TQt::Key_0 },
+        { "Key_1", TQt::Key_1 },
+        { "Key_2", TQt::Key_2 },
+        { "Key_3", TQt::Key_3 },
+        { "Key_4", TQt::Key_4 },
+        { "Key_5", TQt::Key_5 },
+        { "Key_6", TQt::Key_6 },
+        { "Key_7", TQt::Key_7 },
+        { "Key_8", TQt::Key_8 },
+        { "Key_9", TQt::Key_9 },
+        { "Key_Colon", TQt::Key_Colon },
+        { "Key_Semicolon", TQt::Key_Semicolon },
+        { "Key_Less", TQt::Key_Less },
+        { "Key_Equal", TQt::Key_Equal },
+        { "Key_Greater", TQt::Key_Greater },
+        { "Key_Question", TQt::Key_Question },
+        { "Key_At", TQt::Key_At },
+        { "Key_A", TQt::Key_A },
+        { "Key_B", TQt::Key_B },
+        { "Key_C", TQt::Key_C },
+        { "Key_D", TQt::Key_D },
+        { "Key_E", TQt::Key_E },
+        { "Key_F", TQt::Key_F },
+        { "Key_G", TQt::Key_G },
+        { "Key_H", TQt::Key_H },
+        { "Key_I", TQt::Key_I },
+        { "Key_J", TQt::Key_J },
+        { "Key_K", TQt::Key_K },
+        { "Key_L", TQt::Key_L },
+        { "Key_M", TQt::Key_M },
+        { "Key_N", TQt::Key_N },
+        { "Key_O", TQt::Key_O },
+        { "Key_P", TQt::Key_P },
+        { "Key_Q", TQt::Key_Q },
+        { "Key_R", TQt::Key_R },
+        { "Key_S", TQt::Key_S },
+        { "Key_T", TQt::Key_T },
+        { "Key_U", TQt::Key_U },
+        { "Key_V", TQt::Key_V },
+        { "Key_W", TQt::Key_W },
+        { "Key_X", TQt::Key_X },
+        { "Key_Y", TQt::Key_Y },
+        { "Key_Z", TQt::Key_Z },
+        { "Key_BracketLeft", TQt::Key_BracketLeft },
+        { "Key_Backslash", TQt::Key_Backslash },
+        { "Key_BracketRight", TQt::Key_BracketRight },
+        { "Key_AsciiCircum", TQt::Key_AsciiCircum },
+        { "Key_Underscore", TQt::Key_Underscore },
+        { "Key_QuoteLeft", TQt::Key_QuoteLeft },
+        { "Key_BraceLeft", TQt::Key_BraceLeft },
+        { "Key_Bar", TQt::Key_Bar },
+        { "Key_BraceRight", TQt::Key_BraceRight },
+        { "Key_AsciiTilde", TQt::Key_AsciiTilde },
+        { "Key_nobreakspace", TQt::Key_nobreakspace },
+        { "Key_exclamdown", TQt::Key_exclamdown },
+        { "Key_cent", TQt::Key_cent },
+        { "Key_sterling", TQt::Key_sterling },
+        { "Key_currency", TQt::Key_currency },
+        { "Key_yen", TQt::Key_yen },
+        { "Key_brokenbar", TQt::Key_brokenbar },
+        { "Key_section", TQt::Key_section },
+        { "Key_diaeresis", TQt::Key_diaeresis },
+        { "Key_copyright", TQt::Key_copyright },
+        { "Key_ordfeminine", TQt::Key_ordfeminine },
+        { "Key_guillemotleft", TQt::Key_guillemotleft },
+        { "Key_notsign", TQt::Key_notsign },
+        { "Key_hyphen", TQt::Key_hyphen },
+        { "Key_registered", TQt::Key_registered },
+        { "Key_macron", TQt::Key_macron },
+        { "Key_degree", TQt::Key_degree },
+        { "Key_plusminus", TQt::Key_plusminus },
+        { "Key_twosuperior", TQt::Key_twosuperior },
+        { "Key_threesuperior", TQt::Key_threesuperior },
+        { "Key_acute", TQt::Key_acute },
+        { "Key_mu", TQt::Key_mu },
+        { "Key_paragraph", TQt::Key_paragraph },
+        { "Key_periodcentered", TQt::Key_periodcentered },
+        { "Key_cedilla", TQt::Key_cedilla },
+        { "Key_onesuperior", TQt::Key_onesuperior },
+        { "Key_masculine", TQt::Key_masculine },
+        { "Key_guillemotright", TQt::Key_guillemotright },
+        { "Key_onequarter", TQt::Key_onequarter },
+        { "Key_onehalf", TQt::Key_onehalf },
+        { "Key_threequarters", TQt::Key_threequarters },
+        { "Key_questiondown", TQt::Key_questiondown },
+        { "Key_Agrave", TQt::Key_Agrave },
+        { "Key_Aacute", TQt::Key_Aacute },
+        { "Key_Acircumflex", TQt::Key_Acircumflex },
+        { "Key_Atilde", TQt::Key_Atilde },
+        { "Key_Adiaeresis", TQt::Key_Adiaeresis },
+        { "Key_Aring", TQt::Key_Aring },
+        { "Key_AE", TQt::Key_AE },
+        { "Key_Ccedilla", TQt::Key_Ccedilla },
+        { "Key_Egrave", TQt::Key_Egrave },
+        { "Key_Eacute", TQt::Key_Eacute },
+        { "Key_Ecircumflex", TQt::Key_Ecircumflex },
+        { "Key_Ediaeresis", TQt::Key_Ediaeresis },
+        { "Key_Igrave", TQt::Key_Igrave },
+        { "Key_Iacute", TQt::Key_Iacute },
+        { "Key_Icircumflex", TQt::Key_Icircumflex },
+        { "Key_Idiaeresis", TQt::Key_Idiaeresis },
+        { "Key_ETH", TQt::Key_ETH },
+        { "Key_Ntilde", TQt::Key_Ntilde },
+        { "Key_Ograve", TQt::Key_Ograve },
+        { "Key_Oacute", TQt::Key_Oacute },
+        { "Key_Ocircumflex", TQt::Key_Ocircumflex },
+        { "Key_Otilde", TQt::Key_Otilde },
+        { "Key_Odiaeresis", TQt::Key_Odiaeresis },
+        { "Key_multiply", TQt::Key_multiply },
+        { "Key_Ooblique", TQt::Key_Ooblique },
+        { "Key_Ugrave", TQt::Key_Ugrave },
+        { "Key_Uacute", TQt::Key_Uacute },
+        { "Key_Ucircumflex", TQt::Key_Ucircumflex },
+        { "Key_Udiaeresis", TQt::Key_Udiaeresis },
+        { "Key_Yacute", TQt::Key_Yacute },
+        { "Key_THORN", TQt::Key_THORN },
+        { "Key_ssharp", TQt::Key_ssharp },
+        { "Key_agrave", TQt::Key_agrave },
+        { "Key_aacute", TQt::Key_aacute },
+        { "Key_acircumflex", TQt::Key_acircumflex },
+        { "Key_atilde", TQt::Key_atilde },
+        { "Key_adiaeresis", TQt::Key_adiaeresis },
+        { "Key_aring", TQt::Key_aring },
+        { "Key_ae", TQt::Key_ae },
+        { "Key_ccedilla", TQt::Key_ccedilla },
+        { "Key_egrave", TQt::Key_egrave },
+        { "Key_eacute", TQt::Key_eacute },
+        { "Key_ecircumflex", TQt::Key_ecircumflex },
+        { "Key_ediaeresis", TQt::Key_ediaeresis },
+        { "Key_igrave", TQt::Key_igrave },
+        { "Key_iacute", TQt::Key_iacute },
+        { "Key_icircumflex", TQt::Key_icircumflex },
+        { "Key_idiaeresis", TQt::Key_idiaeresis },
+        { "Key_eth", TQt::Key_eth },
+        { "Key_ntilde", TQt::Key_ntilde },
+        { "Key_ograve", TQt::Key_ograve },
+        { "Key_oacute", TQt::Key_oacute },
+        { "Key_ocircumflex", TQt::Key_ocircumflex },
+        { "Key_otilde", TQt::Key_otilde },
+        { "Key_odiaeresis", TQt::Key_odiaeresis },
+        { "Key_division", TQt::Key_division },
+        { "Key_oslash", TQt::Key_oslash },
+        { "Key_ugrave", TQt::Key_ugrave },
+        { "Key_uacute", TQt::Key_uacute },
+        { "Key_ucircumflex", TQt::Key_ucircumflex },
+        { "Key_udiaeresis", TQt::Key_udiaeresis },
+        { "Key_yacute", TQt::Key_yacute },
+        { "Key_thorn", TQt::Key_thorn },
+        { "Key_ydiaeresis", TQt::Key_ydiaeresis },
+        { "Key_Back", TQt::Key_Back },
+        { "Key_Forward", TQt::Key_Forward },
+        { "Key_Stop", TQt::Key_Stop },
+        { "Key_Refresh", TQt::Key_Refresh },
+        { "Key_VolumeDown", TQt::Key_VolumeDown },
+        { "Key_VolumeMute", TQt::Key_VolumeMute },
+        { "Key_VolumeUp", TQt::Key_VolumeUp },
+        { "Key_BassBoost", TQt::Key_BassBoost },
+        { "Key_BassUp", TQt::Key_BassUp },
+        { "Key_BassDown", TQt::Key_BassDown },
+        { "Key_TrebleUp", TQt::Key_TrebleUp },
+        { "Key_TrebleDown", TQt::Key_TrebleDown },
+        { "Key_MediaPlay", TQt::Key_MediaPlay },
+        { "Key_MediaStop", TQt::Key_MediaStop },
+        { "Key_MediaPrev", TQt::Key_MediaPrev },
+        { "Key_MediaNext", TQt::Key_MediaNext },
+        { "Key_MediaRecord", TQt::Key_MediaRecord },
+        { "Key_HomePage", TQt::Key_HomePage },
+        { "Key_Favorites", TQt::Key_Favorites },
+        { "Key_Search", TQt::Key_Search },
+        { "Key_Standby", TQt::Key_Standby },
+        { "Key_OpenUrl", TQt::Key_OpenUrl },
+        { "Key_LaunchMail", TQt::Key_LaunchMail },
+        { "Key_LaunchMedia", TQt::Key_LaunchMedia },
+        { "Key_Launch0", TQt::Key_Launch0 },
+        { "Key_Launch1", TQt::Key_Launch1 },
+        { "Key_Launch2", TQt::Key_Launch2 },
+        { "Key_Launch3", TQt::Key_Launch3 },
+        { "Key_Launch4", TQt::Key_Launch4 },
+        { "Key_Launch5", TQt::Key_Launch5 },
+        { "Key_Launch6", TQt::Key_Launch6 },
+        { "Key_Launch7", TQt::Key_Launch7 },
+        { "Key_Launch8", TQt::Key_Launch8 },
+        { "Key_Launch9", TQt::Key_Launch9 },
+        { "Key_LaunchA", TQt::Key_LaunchA },
+        { "Key_LaunchB", TQt::Key_LaunchB },
+        { "Key_LaunchC", TQt::Key_LaunchC },
+        { "Key_LaunchD", TQt::Key_LaunchD },
+        { "Key_LaunchE", TQt::Key_LaunchE },
+        { "Key_LaunchF", TQt::Key_LaunchF },
+        { "Key_MediaLast", TQt::Key_MediaLast },
+        { "Key_unknown", TQt::Key_unknown },
         // enum ArrowType
-        { "UpArrow", Qt::UpArrow },
-        { "DownArrow", Qt::DownArrow },
-        { "LeftArrow", Qt::LeftArrow },
-        { "RightArrow", Qt::RightArrow },
+        { "UpArrow", TQt::UpArrow },
+        { "DownArrow", TQt::DownArrow },
+        { "LeftArrow", TQt::LeftArrow },
+        { "RightArrow", TQt::RightArrow },
         // enum RasterOp
-        { "CopyROP", Qt::CopyROP },
-        { "OrROP", Qt::OrROP },
-        { "XorROP", Qt::XorROP },
-        { "NotAndROP", Qt::NotAndROP },
-        { "EraseROP", Qt::EraseROP },
-        { "NotCopyROP", Qt::NotCopyROP },
-        { "NotOrROP", Qt::NotOrROP },
-        { "NotXorROP", Qt::NotXorROP },
-        { "AndROP", Qt::AndROP },
-        { "NotEraseROP", Qt::NotEraseROP },
-        { "NotROP", Qt::NotROP },
-        { "ClearROP", Qt::ClearROP },
-        { "SetROP", Qt::SetROP },
-        { "NopROP", Qt::NopROP },
-        { "AndNotROP", Qt::AndNotROP },
-        { "OrNotROP", Qt::OrNotROP },
-        { "NandROP", Qt::NandROP },
-        { "NorROP", Qt::NorROP },
-        { "LastROP", Qt::LastROP },
+        { "CopyROP", TQt::CopyROP },
+        { "OrROP", TQt::OrROP },
+        { "XorROP", TQt::XorROP },
+        { "NotAndROP", TQt::NotAndROP },
+        { "EraseROP", TQt::EraseROP },
+        { "NotCopyROP", TQt::NotCopyROP },
+        { "NotOrROP", TQt::NotOrROP },
+        { "NotXorROP", TQt::NotXorROP },
+        { "AndROP", TQt::AndROP },
+        { "NotEraseROP", TQt::NotEraseROP },
+        { "NotROP", TQt::NotROP },
+        { "ClearROP", TQt::ClearROP },
+        { "SetROP", TQt::SetROP },
+        { "NopROP", TQt::NopROP },
+        { "AndNotROP", TQt::AndNotROP },
+        { "OrNotROP", TQt::OrNotROP },
+        { "NandROP", TQt::NandROP },
+        { "NorROP", TQt::NorROP },
+        { "LastROP", TQt::LastROP },
         // enum PenStyle
-        { "NoPen", Qt::NoPen },
-        { "SolidLine", Qt::SolidLine },
-        { "DashLine", Qt::DashLine },
-        { "DotLine", Qt::DotLine },
-        { "DashDotLine", Qt::DashDotLine },
-        { "DashDotDotLine", Qt::DashDotDotLine },
-        { "MPenStyle", Qt::MPenStyle },
+        { "NoPen", TQt::NoPen },
+        { "SolidLine", TQt::SolidLine },
+        { "DashLine", TQt::DashLine },
+        { "DotLine", TQt::DotLine },
+        { "DashDotLine", TQt::DashDotLine },
+        { "DashDotDotLine", TQt::DashDotDotLine },
+        { "MPenStyle", TQt::MPenStyle },
         // enum PenCapStyle
-        { "FlatCap", Qt::FlatCap },
-        { "SquareCap", Qt::SquareCap },
-        { "RoundCap", Qt::RoundCap },
-        { "MPenCapStyle", Qt::MPenCapStyle },
+        { "FlatCap", TQt::FlatCap },
+        { "SquareCap", TQt::SquareCap },
+        { "RoundCap", TQt::RoundCap },
+        { "MPenCapStyle", TQt::MPenCapStyle },
         // enum PenJoinStyle
-        { "MiterJoin", Qt::MiterJoin },
-        { "BevelJoin", Qt::BevelJoin },
-        { "RoundJoin", Qt::RoundJoin },
-        { "MPenJoinStyle", Qt::MPenJoinStyle },
+        { "MiterJoin", TQt::MiterJoin },
+        { "BevelJoin", TQt::BevelJoin },
+        { "RoundJoin", TQt::RoundJoin },
+        { "MPenJoinStyle", TQt::MPenJoinStyle },
         // enum BrushStyle
-        { "NoBrush", Qt::NoBrush },
-        { "SolidPattern", Qt::SolidPattern },
-        { "Dense1Pattern", Qt::Dense1Pattern },
-        { "Dense2Pattern", Qt::Dense2Pattern },
-        { "Dense3Pattern", Qt::Dense3Pattern },
-        { "Dense4Pattern", Qt::Dense4Pattern },
-        { "Dense5Pattern", Qt::Dense5Pattern },
-        { "Dense6Pattern", Qt::Dense6Pattern },
-        { "Dense7Pattern", Qt::Dense7Pattern },
-        { "HorPattern", Qt::HorPattern },
-        { "VerPattern", Qt::VerPattern },
-        { "CrossPattern", Qt::CrossPattern },
-        { "BDiagPattern", Qt::BDiagPattern },
-        { "FDiagPattern", Qt::FDiagPattern },
-        { "DiagCrossPattern", Qt::DiagCrossPattern },
-        { "CustomPattern", Qt::CustomPattern },
+        { "NoBrush", TQt::NoBrush },
+        { "SolidPattern", TQt::SolidPattern },
+        { "Dense1Pattern", TQt::Dense1Pattern },
+        { "Dense2Pattern", TQt::Dense2Pattern },
+        { "Dense3Pattern", TQt::Dense3Pattern },
+        { "Dense4Pattern", TQt::Dense4Pattern },
+        { "Dense5Pattern", TQt::Dense5Pattern },
+        { "Dense6Pattern", TQt::Dense6Pattern },
+        { "Dense7Pattern", TQt::Dense7Pattern },
+        { "HorPattern", TQt::HorPattern },
+        { "VerPattern", TQt::VerPattern },
+        { "CrossPattern", TQt::CrossPattern },
+        { "BDiagPattern", TQt::BDiagPattern },
+        { "FDiagPattern", TQt::FDiagPattern },
+        { "DiagCrossPattern", TQt::DiagCrossPattern },
+        { "CustomPattern", TQt::CustomPattern },
         // enum MacintoshVersion
-        { "MV_Unknown", Qt::MV_Unknown },
-        { "MV_9", Qt::MV_9 },
-        { "MV_10_DOT_0", Qt::MV_10_DOT_0 },
-        { "MV_10_DOT_1", Qt::MV_10_DOT_1 },
-        { "MV_10_DOT_2", Qt::MV_10_DOT_2 },
-        { "MV_10_DOT_3", Qt::MV_10_DOT_3 },
-        { "MV_CHEETAH", Qt::MV_CHEETAH },
-        { "MV_PUMA", Qt::MV_PUMA },
-        { "MV_JAGUAR", Qt::MV_JAGUAR },
-        { "MV_PANTHER", Qt::MV_PANTHER },
+        { "MV_Unknown", TQt::MV_Unknown },
+        { "MV_9", TQt::MV_9 },
+        { "MV_10_DOT_0", TQt::MV_10_DOT_0 },
+        { "MV_10_DOT_1", TQt::MV_10_DOT_1 },
+        { "MV_10_DOT_2", TQt::MV_10_DOT_2 },
+        { "MV_10_DOT_3", TQt::MV_10_DOT_3 },
+        { "MV_CHEETAH", TQt::MV_CHEETAH },
+        { "MV_PUMA", TQt::MV_PUMA },
+        { "MV_JAGUAR", TQt::MV_JAGUAR },
+        { "MV_PANTHER", TQt::MV_PANTHER },
         // enum WindowsVersion
-        { "WV_32s", Qt::WV_32s },
-        { "WV_95", Qt::WV_95 },
-        { "WV_98", Qt::WV_98 },
-        { "WV_Me", Qt::WV_Me },
-        { "WV_DOS_based", Qt::WV_DOS_based },
-        { "WV_NT", Qt::WV_NT },
-        { "WV_2000", Qt::WV_2000 },
-        { "WV_XP", Qt::WV_XP },
-        { "WV_2003", Qt::WV_2003 },
-        { "WV_NT_based", Qt::WV_NT_based },
-        { "WV_CE", Qt::WV_CE },
-        { "WV_CENET", Qt::WV_CENET },
-        { "WV_CE_based", Qt::WV_CE_based },
+        { "WV_32s", TQt::WV_32s },
+        { "WV_95", TQt::WV_95 },
+        { "WV_98", TQt::WV_98 },
+        { "WV_Me", TQt::WV_Me },
+        { "WV_DOS_based", TQt::WV_DOS_based },
+        { "WV_NT", TQt::WV_NT },
+        { "WV_2000", TQt::WV_2000 },
+        { "WV_XP", TQt::WV_XP },
+        { "WV_2003", TQt::WV_2003 },
+        { "WV_NT_based", TQt::WV_NT_based },
+        { "WV_CE", TQt::WV_CE },
+        { "WV_CENET", TQt::WV_CENET },
+        { "WV_CE_based", TQt::WV_CE_based },
         // enum UIEffect
-        { "UI_General", Qt::UI_General },
-        { "UI_AnimateMenu", Qt::UI_AnimateMenu },
-        { "UI_FadeMenu", Qt::UI_FadeMenu },
-        { "UI_AnimateCombo", Qt::UI_AnimateCombo },
-        { "UI_AnimateTooltip", Qt::UI_AnimateTooltip },
-        { "UI_FadeTooltip", Qt::UI_FadeTooltip },
-        { "UI_AnimateToolBox", Qt::UI_AnimateToolBox },
+        { "UI_General", TQt::UI_General },
+        { "UI_AnimateMenu", TQt::UI_AnimateMenu },
+        { "UI_FadeMenu", TQt::UI_FadeMenu },
+        { "UI_AnimateCombo", TQt::UI_AnimateCombo },
+        { "UI_AnimateTooltip", TQt::UI_AnimateTooltip },
+        { "UI_FadeTooltip", TQt::UI_FadeTooltip },
+        { "UI_AnimateToolBox", TQt::UI_AnimateToolBox },
         // enum CursorShape
-        { "ArrowCursor", Qt::ArrowCursor },
-        { "UpArrowCursor", Qt::UpArrowCursor },
-        { "CrossCursor", Qt::CrossCursor },
-        { "WaitCursor", Qt::WaitCursor },
-        { "IbeamCursor", Qt::IbeamCursor },
-        { "SizeVerCursor", Qt::SizeVerCursor },
-        { "SizeHorCursor", Qt::SizeHorCursor },
-        { "SizeBDiagCursor", Qt::SizeBDiagCursor },
-        { "SizeFDiagCursor", Qt::SizeFDiagCursor },
-        { "SizeAllCursor", Qt::SizeAllCursor },
-        { "BlankCursor", Qt::BlankCursor },
-        { "SplitVCursor", Qt::SplitVCursor },
-        { "SplitHCursor", Qt::SplitHCursor },
-        { "PointingHandCursor", Qt::PointingHandCursor },
-        { "ForbiddenCursor", Qt::ForbiddenCursor },
-        { "WhatsThisCursor", Qt::WhatsThisCursor },
-        { "BusyCursor", Qt::BusyCursor },
-        { "LastCursor", Qt::LastCursor },
-        { "BitmapCursor", Qt::BitmapCursor },
+        { "ArrowCursor", TQt::ArrowCursor },
+        { "UpArrowCursor", TQt::UpArrowCursor },
+        { "CrossCursor", TQt::CrossCursor },
+        { "WaitCursor", TQt::WaitCursor },
+        { "IbeamCursor", TQt::IbeamCursor },
+        { "SizeVerCursor", TQt::SizeVerCursor },
+        { "SizeHorCursor", TQt::SizeHorCursor },
+        { "SizeBDiagCursor", TQt::SizeBDiagCursor },
+        { "SizeFDiagCursor", TQt::SizeFDiagCursor },
+        { "SizeAllCursor", TQt::SizeAllCursor },
+        { "BlankCursor", TQt::BlankCursor },
+        { "SplitVCursor", TQt::SplitVCursor },
+        { "SplitHCursor", TQt::SplitHCursor },
+        { "PointingHandCursor", TQt::PointingHandCursor },
+        { "ForbiddenCursor", TQt::ForbiddenCursor },
+        { "WhatsThisCursor", TQt::WhatsThisCursor },
+        { "BusyCursor", TQt::BusyCursor },
+        { "LastCursor", TQt::LastCursor },
+        { "BitmapCursor", TQt::BitmapCursor },
         // enum TextFormat
-        { "PlainText", Qt::PlainText },
-        { "RichText", Qt::RichText },
-        { "AutoText", Qt::AutoText },
-        { "LogText", Qt::LogText },
+        { "PlainText", TQt::PlainText },
+        { "RichText", TQt::RichText },
+        { "AutoText", TQt::AutoText },
+        { "LogText", TQt::LogText },
         // enum AnchorAttribute
-        { "AnchorName", Qt::AnchorName },
-        { "AnchorHref", Qt::AnchorHref },
+        { "AnchorName", TQt::AnchorName },
+        { "AnchorHref", TQt::AnchorHref },
         // enum Dock
-        { "DockUnmanaged", Qt::DockUnmanaged },
-        { "DockTornOff", Qt::DockTornOff },
-        { "DockTop", Qt::DockTop },
-        { "DockBottom", Qt::DockBottom },
-        { "DockRight", Qt::DockRight },
-        { "DockLeft", Qt::DockLeft },
-        { "DockMinimized", Qt::DockMinimized },
-        { "Unmanaged", Qt::Unmanaged },
-        { "TornOff", Qt::TornOff },
-        { "Top", Qt::Top },
-        { "Bottom", Qt::Bottom },
-        { "Right", Qt::Right },
-        { "Left", Qt::Left },
-        { "Minimized", Qt::Minimized },
+        { "DockUnmanaged", TQt::DockUnmanaged },
+        { "DockTornOff", TQt::DockTornOff },
+        { "DockTop", TQt::DockTop },
+        { "DockBottom", TQt::DockBottom },
+        { "DockRight", TQt::DockRight },
+        { "DockLeft", TQt::DockLeft },
+        { "DockMinimized", TQt::DockMinimized },
+        { "Unmanaged", TQt::Unmanaged },
+        { "TornOff", TQt::TornOff },
+        { "Top", TQt::Top },
+        { "Bottom", TQt::Bottom },
+        { "Right", TQt::Right },
+        { "Left", TQt::Left },
+        { "Minimized", TQt::Minimized },
         // enum DateFormat
-        { "TextDate", Qt::TextDate },
-        { "ISODate", Qt::ISODate },
-        { "LocalDate", Qt::LocalDate },
+        { "TextDate", TQt::TextDate },
+        { "ISODate", TQt::ISODate },
+        { "LocalDate", TQt::LocalDate },
         // enum TimeSpec
-        { "LocalTime", Qt::LocalTime },
-        { "UTC", Qt::UTC },
+        { "LocalTime", TQt::LocalTime },
+        { "UTC", TQt::UTC },
         // enum BackgroundMode
-        { "FixedColor", Qt::FixedColor },
-        { "FixedPixmap", Qt::FixedPixmap },
-        { "NoBackground", Qt::NoBackground },
-        { "PaletteForeground", Qt::PaletteForeground },
-        { "PaletteButton", Qt::PaletteButton },
-        { "PaletteLight", Qt::PaletteLight },
-        { "PaletteMidlight", Qt::PaletteMidlight },
-        { "PaletteDark", Qt::PaletteDark },
-        { "PaletteMid", Qt::PaletteMid },
-        { "PaletteText", Qt::PaletteText },
-        { "PaletteBrightText", Qt::PaletteBrightText },
-        { "PaletteBase", Qt::PaletteBase },
-        { "PaletteBackground", Qt::PaletteBackground },
-        { "PaletteShadow", Qt::PaletteShadow },
-        { "PaletteHighlight", Qt::PaletteHighlight },
-        { "PaletteHighlightedText", Qt::PaletteHighlightedText },
-        { "PaletteButtonText", Qt::PaletteButtonText },
-        { "PaletteLink", Qt::PaletteLink },
-        { "PaletteLinkVisited", Qt::PaletteLinkVisited },
-        { "X11ParentRelative", Qt::X11ParentRelative },
+        { "FixedColor", TQt::FixedColor },
+        { "FixedPixmap", TQt::FixedPixmap },
+        { "NoBackground", TQt::NoBackground },
+        { "PaletteForeground", TQt::PaletteForeground },
+        { "PaletteButton", TQt::PaletteButton },
+        { "PaletteLight", TQt::PaletteLight },
+        { "PaletteMidlight", TQt::PaletteMidlight },
+        { "PaletteDark", TQt::PaletteDark },
+        { "PaletteMid", TQt::PaletteMid },
+        { "PaletteText", TQt::PaletteText },
+        { "PaletteBrightText", TQt::PaletteBrightText },
+        { "PaletteBase", TQt::PaletteBase },
+        { "PaletteBackground", TQt::PaletteBackground },
+        { "PaletteShadow", TQt::PaletteShadow },
+        { "PaletteHighlight", TQt::PaletteHighlight },
+        { "PaletteHighlightedText", TQt::PaletteHighlightedText },
+        { "PaletteButtonText", TQt::PaletteButtonText },
+        { "PaletteLink", TQt::PaletteLink },
+        { "PaletteLinkVisited", TQt::PaletteLinkVisited },
+        { "X11ParentRelative", TQt::X11ParentRelative },
         // enum StringComparisonMode
-        { "CaseSensitive", Qt::CaseSensitive },
-        { "BeginsWith", Qt::BeginsWith },
-        { "EndsWith", Qt::EndsWith },
-        { "Contains", Qt::Contains },
-        { "ExactMatch", Qt::ExactMatch },
+        { "CaseSensitive", TQt::CaseSensitive },
+        { "BeginsWith", TQt::BeginsWith },
+        { "EndsWith", TQt::EndsWith },
+        { "Contains", TQt::Contains },
+        { "ExactMatch", TQt::ExactMatch },
         // enum Corner
-        { "TopLeft", Qt::TopLeft },
-        { "TopRight", Qt::TopRight },
-        { "BottomLeft", Qt::BottomLeft },
-        { "BottomRight", Qt::BottomRight },
+        { "TopLeft", TQt::TopLeft },
+        { "TopRight", TQt::TopRight },
+        { "BottomLeft", TQt::BottomLeft },
+        { "BottomRight", TQt::BottomRight },
 	{ 0, 0 }
     };
 
@@ -705,7 +705,7 @@ void QtImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TQCString lastName;
+    TTQCString 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 ) {
-        TQObject *obj = ob->object();
+        TTQObject *obj = ob->object();
 	if ( obj )
            return dynamic_cast<Qt *>( obj );
     }
@@ -750,7 +750,7 @@ KJS::Object QtImp::construct( KJS::ExecState *exec, const KJS::List &args )
              break;
     }
 
-    TQString msg = i18n("QtCons has no constructor with id '%1'.").arg(id);
+    TTQString 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;
     }
 
-    TQString msg = i18n( "QtImp has no method with id '%1'." ).arg( id );
+    TTQString 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 d925f0dd..fe6e1d0e 100644
--- a/kjsembed/qtstubs.cpp
+++ b/kjsembed/qtstubs.cpp
@@ -28,8 +28,8 @@
 
 namespace KParts {
 
-ReadOnlyPart::ReadOnlyPart( TQObject *parent, const char *name )
-  : TQObject( parent, name ), m_widget(0)
+ReadOnlyPart::ReadOnlyPart( TTQObject *parent, const char *name )
+  : TTQObject( parent, name ), m_widget(0)
 {
 }
 
@@ -37,7 +37,7 @@ ReadOnlyPart::~ReadOnlyPart()
 {
 }
 
-ReadWritePart::ReadWritePart( TQObject *parent, const char *name )
+ReadWritePart::ReadWritePart( TTQObject *parent, const char *name )
   : ReadOnlyPart( parent, name )
 {
 }
diff --git a/kjsembed/qtstubs.h b/kjsembed/qtstubs.h
index cd676964..322e0348 100644
--- a/kjsembed/qtstubs.h
+++ b/kjsembed/qtstubs.h
@@ -19,32 +19,32 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef QTSTUBS_H
-#define QTSTUBS_H
+#ifndef TQTSTUBS_H
+#define TQTSTUBS_H
 #include "global.h"
 #ifdef QT_ONLY
 
 #include <tqobject.h>
 #include <tqurl.h>
 
-class TQWidget;
+class TTQWidget;
 
-typedef TQUrl KURL;
+typedef TTQUrl KURL;
 
 namespace KParts {
 
-class KJSEMBED_EXPORT ReadOnlyPart : public QObject
+class KJSEMBED_EXPORT ReadOnlyPart : public TQObject
 {
    Q_OBJECT
 
 public:
-   ReadOnlyPart( TQObject *parent, const char *name=0 );
+   ReadOnlyPart( TTQObject *parent, const char *name=0 );
    virtual ~ReadOnlyPart();
 
-   void setWidget( TQWidget *w ) { m_widget = w; }
+   void setWidget( TTQWidget *w ) { m_widget = w; }
 
 private:
-   TQWidget *m_widget;
+   TTQWidget *m_widget;
 };
 
 class KJSEMBED_EXPORT ReadWritePart : public ReadOnlyPart
@@ -52,7 +52,7 @@ class KJSEMBED_EXPORT ReadWritePart : public ReadOnlyPart
    Q_OBJECT
 
 public:
-   ReadWritePart( TQObject *parent, const char *name=0 );
+   ReadWritePart( TTQObject *parent, const char *name=0 );
    virtual ~ReadWritePart();
 };
 
@@ -73,4 +73,4 @@ typedef XMLActionClientStub XMLActionClient;
 
 #endif // QT_ONLY
 
-#endif // QTSTUBS_H
+#endif // TQTSTUBS_H
diff --git a/kjsembed/slotproxy.cpp b/kjsembed/slotproxy.cpp
index dc5d7c2b..addc7552 100644
--- a/kjsembed/slotproxy.cpp
+++ b/kjsembed/slotproxy.cpp
@@ -40,14 +40,14 @@
 
 namespace KJSEmbed {
 
-JSSlotProxy::JSSlotProxy( TQObject *parent, const char *name )
-    : TQObject( parent, name ? name : "slot_proxy" ),
+JSSlotProxy::JSSlotProxy( TTQObject *parent, const char *name )
+    : TTQObject( parent, name ? name : "slot_proxy" ),
       proxy(0), js(0)
 {
 }
 
-JSSlotProxy::JSSlotProxy( TQObject *parent, const char *name, JSObjectProxy *prx )
-    : TQObject( parent, name ? name : "slot_proxy" ),
+JSSlotProxy::JSSlotProxy( TTQObject *parent, const char *name, JSObjectProxy *prx )
+    : TTQObject( 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 TQString &s )
+void JSSlotProxy::slot_string( const TTQString &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 TQColor &color )
+void JSSlotProxy::slot_color( const TTQColor &color )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), color) );
     execute( args );
 }
 
-void JSSlotProxy::slot_font( const TQFont &font )
+void JSSlotProxy::slot_font( const TTQFont &font )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), font) );
@@ -126,31 +126,31 @@ void JSSlotProxy::slot_font( const TQFont &font )
 }// namespace KJSEmbed
 
 
-void KJSEmbed::JSSlotProxy::slot_point( const TQPoint & point )
+void KJSEmbed::JSSlotProxy::slot_point( const TTQPoint & point )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), point) );
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_rect( const TQRect & rec )
+void KJSEmbed::JSSlotProxy::slot_rect( const TTQRect & rec )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), rec) );
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_size( const TQSize & size )
+void KJSEmbed::JSSlotProxy::slot_size( const TTQSize & size )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), size) );
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_pixmap( const TQPixmap & pix )
+void KJSEmbed::JSSlotProxy::slot_pixmap( const TTQPixmap & pix )
 {
     KJS::List args;
-    args.append( convertToValue(js->globalExec(), TQVariant( pix ) ) );
+    args.append( convertToValue(js->globalExec(), TTQVariant( pix ) ) );
     execute( args );
 }
 
@@ -211,7 +211,7 @@ void KJSEmbed::JSSlotProxy::execute( const KJS::List &args )
     }
 }
 
-void KJSEmbed::JSSlotProxy::slot_widget( TQWidget * widget )
+void KJSEmbed::JSSlotProxy::slot_widget( TTQWidget * widget )
 {
     KJS::List args;
     if ( widget )
@@ -222,22 +222,22 @@ void KJSEmbed::JSSlotProxy::slot_widget( TQWidget * widget )
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_datetime( const TQDateTime & dateTime )
+void KJSEmbed::JSSlotProxy::slot_datetime( const TTQDateTime & dateTime )
 {
     KJS::List args;
-    args.append( convertToValue(js->globalExec(), TQVariant( dateTime ) ));
+    args.append( convertToValue(js->globalExec(), TTQVariant( dateTime ) ));
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_datedate( const TQDate & date1, const TQDate & date2 )
+void KJSEmbed::JSSlotProxy::slot_datedate( const TTQDate & date1, const TTQDate & date2 )
 {
     KJS::List args;
-    args.append( convertToValue(js->globalExec(), TQVariant( date1 ) ));
-    args.append( convertToValue(js->globalExec(), TQVariant( date2 ) ));
+    args.append( convertToValue(js->globalExec(), TTQVariant( date1 ) ));
+    args.append( convertToValue(js->globalExec(), TTQVariant( date2 ) ));
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_colorstring( const TQColor & color, const TQString & string )
+void KJSEmbed::JSSlotProxy::slot_colorstring( const TTQColor & color, const TTQString & string )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), color ));
@@ -245,28 +245,28 @@ void KJSEmbed::JSSlotProxy::slot_colorstring( const TQColor & color, const TQStr
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_image( const TQImage & image )
+void KJSEmbed::JSSlotProxy::slot_image( const TTQImage & image )
 {
     KJS::List args;
-    args.append( convertToValue(js->globalExec(), TQVariant( image ) ));
+    args.append( convertToValue(js->globalExec(), TTQVariant( image ) ));
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_date( const TQDate & date )
+void KJSEmbed::JSSlotProxy::slot_date( const TTQDate & date )
 {
     KJS::List args;
-    args.append( convertToValue(js->globalExec(), TQVariant( date ) ));
+    args.append( convertToValue(js->globalExec(), TTQVariant( date ) ));
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_time( const TQTime &time )
+void KJSEmbed::JSSlotProxy::slot_time( const TTQTime &time )
 {
     KJS::List args;
-    args.append( convertToValue(js->globalExec(), TQVariant( time ) ));
+    args.append( convertToValue(js->globalExec(), TTQVariant( time ) ));
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_variant( const TQVariant & variant )
+void KJSEmbed::JSSlotProxy::slot_variant( const TTQVariant & variant )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), variant ) );
diff --git a/kjsembed/slotproxy.h b/kjsembed/slotproxy.h
index 2dc3565d..b0c4cb42 100644
--- a/kjsembed/slotproxy.h
+++ b/kjsembed/slotproxy.h
@@ -32,9 +32,9 @@
 #include <kjsembed/qtstubs.h>
 #endif // QT_ONLY
 
-class TQDate;
-class TQTime;
-class TQDateTime;
+class TTQDate;
+class TTQTime;
+class TTQDateTime;
 
 namespace KJS {
 class Interpreter;
@@ -49,58 +49,58 @@ class JSObjectProxy;
  *
  * @author Richard Moore, rich@kde.org
  */
-class KJSEMBED_EXPORT JSSlotProxy : public QObject
+class KJSEMBED_EXPORT JSSlotProxy : public TQObject
 {
     Q_OBJECT
 
 public:
-    JSSlotProxy( TQObject *parent, const char *name=0 );
-    JSSlotProxy( TQObject *parent, const char *name, JSObjectProxy *prx );
+    JSSlotProxy( TTQObject *parent, const char *name=0 );
+    JSSlotProxy( TTQObject *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 TQString &method ) { this->method = method; }
+    void setMethod( const TTQString &method ) { this->method = method; }
 
 public slots:
     void slot_void();
     void slot_bool( bool b );
-    void slot_string( const TQString &s );
+    void slot_string( const TTQString &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 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_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_url( const KURL &url );
     void slot_intint( int , int );
     void slot_intbool( int , bool );
     void slot_intintint( int , int , int );
 
-    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_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_variant( const TQVariant &variant );
+    void slot_variant( const TTQVariant &variant );
     
-    void slot_widget( TQWidget *widget );
+    void slot_widget( TTQWidget *widget );
 
 private:
     void execute( const KJS::List &args );
     JSObjectProxy *proxy;
     KJS::Interpreter *js;
     KJS::Object obj;
-    TQString method;
+    TTQString method;
     class SlotProxyPrivate *d;
 };
 
diff --git a/kjsembed/slotutils.cpp b/kjsembed/slotutils.cpp
index 217d97a0..7f429ace 100644
--- a/kjsembed/slotutils.cpp
+++ b/kjsembed/slotutils.cpp
@@ -69,33 +69,33 @@ JSSlotUtils::~JSSlotUtils()
 {
 }
 
-bool JSSlotUtils::connect( TQObject *sender, const char *sig, TQObject *recv, const char *dest )
+bool JSSlotUtils::connect( TTQObject *sender, const char *sig, TTQObject *recv, const char *dest )
 {
     if ( (!sender) || (!recv) )
 	return false;
 
     // Source
-    TQString si = TQString("2%1").arg(sig);
+    TTQString si = TTQString("2%1").arg(sig);
     const char *sigc = si.ascii();
 
     // Connect to slot
     if ( recv->metaObject()->findSlot(dest, true) >= 0 ) {
-	TQString sl = TQString("1%1").arg(dest);
+	TTQString sl = TTQString("1%1").arg(dest);
 	const char *slotc = sl.ascii();
 
 	//kdDebug(80001) << "connect: "<<sender->name()<<" "<<sigc<<", slot "<<recv->name()<<" "<<slotc<< endl;
-	bool ok = TQObject::connect( sender, sigc, recv, slotc );
+	bool ok = TTQObject::connect( sender, sigc, recv, slotc );
 	if (ok)
 	    return true;
     }
 
     // Connect to signal
     if ( recv->metaObject()->findSignal(dest, true) >= 0 ) {
-	TQString si2 = TQString("2%1").arg(dest);
+	TTQString si2 = TTQString("2%1").arg(dest);
 	const char *sig2c = si2.ascii();
 
 	kdDebug(80001) << "connect: "<<sender->name()<<" "<<sigc<<", sig "<<recv->name()<<" "<<sig2c<< endl;
-	bool ok = TQObject::connect( sender, sigc, recv, sig2c );
+	bool ok = TTQObject::connect( sender, sigc, recv, sig2c );
 	if (ok)
 	    return true;
     }
@@ -104,8 +104,8 @@ bool JSSlotUtils::connect( TQObject *sender, const char *sig, TQObject *recv, co
 }
 
 KJS::Boolean JSSlotUtils::disconnect( KJS::ExecState */*exec*/, KJS::Object &/*self*/,
-				    TQObject *sender, const char *sig,
-				    TQObject *recv, const char *dest )
+				    TTQObject *sender, const char *sig,
+				    TTQObject *recv, const char *dest )
 {
     if ( (!sender) || (!recv) )
 	return KJS::Boolean(false);
@@ -113,28 +113,28 @@ KJS::Boolean JSSlotUtils::disconnect( KJS::ExecState */*exec*/, KJS::Object &/*s
     bool ok;
 
     // Source
-    TQString si = TQString("2%1").arg(sig);
+    TTQString si = TTQString("2%1").arg(sig);
     const char *sigc = si.ascii();
 
     // Disconnect from slot
     if ( recv->metaObject()->findSlot(dest, true) >= 0 ) {
-	TQString sl = TQString("1%1").arg(dest);
+	TTQString sl = TTQString("1%1").arg(dest);
 	const char *slotc = sl.ascii();
 
 	//kdDebug(80001) << "disconnect: "<<sender->name()<<" "<<sigc<<", slot "<<recv->name()<<" "<<slotc<< endl;
-	ok = TQObject::disconnect( sender, sigc, recv, slotc );
+	ok = TTQObject::disconnect( sender, sigc, recv, slotc );
 	if (ok)
 	    return KJS::Boolean(ok);
     }
 
     // Disonnect to signal
     if ( recv->metaObject()->findSignal(dest, true) >= 0 ) {
-	TQString si2("2");
+	TTQString si2("2");
 	si2 = si2 + dest;
 	const char *sig2c = si2.ascii();
 
 	//kdDebug(80001)<< "disconnect: "<<sender->name()<<" "<<sigc<<", sig "<<recv->name()<<" "<<sig2c<< endl;
-	ok = TQObject::disconnect( sender, sigc, recv, sig2c );
+	ok = TTQObject::disconnect( sender, sigc, recv, sig2c );
 	if (ok)
 	    return KJS::Boolean(ok);
     }
@@ -142,9 +142,9 @@ KJS::Boolean JSSlotUtils::disconnect( KJS::ExecState */*exec*/, KJS::Object &/*s
     return KJS::Boolean(false);
 }
 
-KJS::Value JSSlotUtils::extractValue( KJS::ExecState *exec, QUObject *uo, JSObjectProxy *parent )
+KJS::Value JSSlotUtils::extractValue( KJS::ExecState *exec, TQUObject *uo, JSObjectProxy *parent )
 {
-    TQCString typenm( uo->type->desc() );
+    TTQCString typenm( uo->type->desc() );
     kdDebug(80001) << "JSSlotUtils:extractValue() " << typenm << endl;
 
     if ( typenm == "null" )
@@ -157,74 +157,74 @@ KJS::Value JSSlotUtils::extractValue( KJS::ExecState *exec, QUObject *uo, JSObje
 	return KJS::Number( static_QUType_double.get(uo) );
     else if ( typenm == "charstar" )
 	return KJS::String( static_QUType_charstar.get(uo) );
-    else if ( typenm == "TQString" )
-	return KJS::String( static_QUType_QString.get(uo) );
-    else if ( typenm == "TQVariant" )
-	return convertToValue( exec, static_QUType_QVariant.get(uo) );
+    else if ( typenm == "TTQString" )
+	return KJS::String( static_QUType_TQString.get(uo) );
+    else if ( typenm == "TTQVariant" )
+	return convertToValue( exec, static_QUType_TQVariant.get(uo) );
     else if ( typenm == "ptr" ) {
 	void *ptr = static_QUType_ptr.get(uo);
 
-	// If it's a TQObject and we know the parent
+	// If it's a TTQObject and we know the parent
 	if ( ptr && parent ) {
-	    TQObject *qobj = (TQObject *)(ptr); // Crash in kst
+	    TTQObject *qobj = (TTQObject *)(ptr); // Crash in kst
 	    return parent->part()->factory()->createProxy( exec, qobj, parent);
 	}
     }
 
     kdWarning(80001) << "JSSlotUtils:extractValue() Failed (" << typenm << ")" << endl;
-    TQString msg = i18n( "Value of type (%1) is not supported." ).arg( typenm );
+    TTQString msg = i18n( "Value of type (%1) is not supported." ).arg( typenm );
     throwError(exec, msg,KJS::TypeError);
     return KJS::Null();
 }
 
 //
-// Add a value to a QUObject.
+// Add a value to a TQUObject.
 //
 
-void JSSlotUtils::implantInt( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v )
+void JSSlotUtils::implantInt( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v )
 {
     static_QUType_int.set( uo, v.toInteger( exec ) );
 }
 
-void JSSlotUtils::implantCharStar( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v )
+void JSSlotUtils::implantCharStar( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v )
 {
     static_QUType_charstar.set( uo, v.toString( exec ).ascii() );
 }
 
-void JSSlotUtils::implantBool( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v )
+void JSSlotUtils::implantBool( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v )
 {
     static_QUType_bool.set( uo, v.toBoolean( exec ) );
 }
 
-void JSSlotUtils::implantDouble( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v )
+void JSSlotUtils::implantDouble( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v )
 {
     static_QUType_double.set( uo, v.toNumber( exec ) );
 }
 
-void JSSlotUtils::implantQString( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v )
+void JSSlotUtils::implantTQString( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v )
 {
-    static_QUType_QString.set( uo, v.toString(exec).qstring() );
+    static_QUType_TQString.set( uo, v.toString(exec).qstring() );
 }
 
-void JSSlotUtils::implantCString( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v )
+void JSSlotUtils::implantCString( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v )
 {
     static_QUType_charstar.set( uo, v.toString(exec).ascii() );
 }
 
-void JSSlotUtils::implantURL( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v,KURL *url )
+void JSSlotUtils::implantURL( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v,KURL *url )
 {
-    *url = TQString( v.toString(exec).qstring() );
+    *url = TTQString( v.toString(exec).qstring() );
     static_QUType_ptr.set( uo, url );
 }
 
-void JSSlotUtils::implantColor( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQColor *color )
+void JSSlotUtils::implantColor( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQColor *color )
 {
     bool ok;
-    TQString s( v.toString(exec).qstring() );
+    TTQString s( v.toString(exec).qstring() );
 
     if ( s.startsWith("#") ) {
 
-	TQRegExp re("#([0-9a-f][0-9a-f]){3,4}");
+	TTQRegExp 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, QUObject *uo, const KJS::V
 	    uint b = re.cap(3).toUInt(&ok, 16);
 
 	    if ( re.numCaptures() == 3 )
-		*color = TQColor(r,g,b);
+		*color = TTQColor(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, QUObject *uo, const KJS::V
 		pix = pix << 8;
 		pix = pix | a;
 
-		*color = TQColor( qRgba(r,g,b,a), pix );
+		*color = TTQColor( qRgba(r,g,b,a), pix );
 	    }
 	}
 
     }
     else {
 	// Try for a named color
-	*color = TQColor( s );
+	*color = TTQColor( s );
     }
 
     static_QUType_ptr.set( uo, color );
 }
 
-void JSSlotUtils::implantPoint( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQPoint *point )
+void JSSlotUtils::implantPoint( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQPoint *point )
 {
     KJS::Object o = v.toObject( exec );
     if ( !o.isValid() )
@@ -277,11 +277,11 @@ void JSSlotUtils::implantPoint( KJS::ExecState *exec, QUObject *uo, const KJS::V
     else
 	return;
 
-    *point = TQPoint( x, y );
+    *point = TTQPoint( x, y );
     static_QUType_ptr.set( uo, point );
 }
 
-void JSSlotUtils::implantSize( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQSize *size )
+void JSSlotUtils::implantSize( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQSize *size )
 {
     KJS::Object o = v.toObject( exec );
     if ( !o.isValid() )
@@ -301,11 +301,11 @@ void JSSlotUtils::implantSize( KJS::ExecState *exec, QUObject *uo, const KJS::Va
     else
 	return;
 
-    *size = TQSize( w, h );
+    *size = TTQSize( w, h );
     static_QUType_ptr.set( uo, size );
 }
 
-void JSSlotUtils::implantRect( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQRect *rect )
+void JSSlotUtils::implantRect( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQRect *rect )
 {
     KJS::Object o = v.toObject( exec );
     if ( !o.isValid() )
@@ -332,57 +332,57 @@ void JSSlotUtils::implantRect( KJS::ExecState *exec, QUObject *uo, const KJS::Va
     else
 	return;
 
-    *rect = TQRect( x, y, w, h );
+    *rect = TTQRect( x, y, w, h );
     static_QUType_ptr.set( uo, rect );
 }
 
-void JSSlotUtils::implantDate(  KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQDate *date )
+void JSSlotUtils::implantDate(  KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQDate *date )
 {
-	TQDateTime jsDate = convertDateToDateTime(exec, v);
+	TTQDateTime 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, QUObject *uo, const KJS::Value &v, TQStringList *lst )
+void JSSlotUtils::implantStringList(KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQStringList *lst )
 {
   *lst = convertArrayToStringList(exec,v);
   static_QUType_ptr.set(uo,lst);
 }
 
-void JSSlotUtils::implantTime( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQTime *time )
+void JSSlotUtils::implantTime( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQTime *time )
 {
-	TQDateTime jsDate = convertDateToDateTime(exec, v);
+	TTQDateTime 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, QUObject *uo, const KJS::Value &v, TQDateTime *datetime  )
+void JSSlotUtils::implantDateTime( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQDateTime *datetime  )
 {
-	TQDateTime jsDate = convertDateToDateTime(exec, v);
+	TTQDateTime jsDate = convertDateToDateTime(exec, v);
 	datetime->setDate( jsDate.date() );
 	datetime->setTime( jsDate.time() );
 	static_QUType_ptr.set( uo, datetime );
 }
 
-void JSSlotUtils::implantPixmap( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQPixmap *pix )
+void JSSlotUtils::implantPixmap( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQPixmap *pix )
 {
     *pix = convertToVariant(exec, v).toPixmap() ;
     static_QUType_ptr.set( uo, pix );
 }
 
-bool JSSlotUtils::implantQVariant( KJS::ExecState *, QUObject *uo, const KJS::Value &v)
+bool JSSlotUtils::implantTQVariant( KJS::ExecState *, TQUObject *uo, const KJS::Value &v)
 {
     JSValueProxy *prx = JSProxy::toValueProxy( v.imp() );
     if ( !prx )
 	return false;
     kdDebug(80001) << "We got a " << prx->typeName() << endl;
 
-    static_QUType_QVariant.set( uo, prx->toVariant() );
+    static_QUType_TQVariant.set( uo, prx->toVariant() );
     return true;
 }
 
-bool JSSlotUtils::implantValueProxy( KJS::ExecState *, QUObject *uo,
-				     const KJS::Value &val, const TQString &clazz )
+bool JSSlotUtils::implantValueProxy( KJS::ExecState *, TQUObject *uo,
+				     const KJS::Value &val, const TTQString &clazz )
 {
     JSValueProxy *prx = JSProxy::toValueProxy( val.imp() );
     if ( !prx )
@@ -391,14 +391,14 @@ bool JSSlotUtils::implantValueProxy( KJS::ExecState *, QUObject *uo,
 	return false;
 
     kdDebug(80001) << "We got a " << prx->typeName() << " and is valid " << prx->toVariant().isValid() << endl;
-    TQVariant var = prx->toVariant();
+    TTQVariant var = prx->toVariant();
     kdDebug(80001) << "We got a " << var.typeName()<< " and is valid " << var.isValid() << endl;
-    static_QUType_QVariant.set( uo, var );
+    static_QUType_TQVariant.set( uo, var );
     return var.isValid();
 }
 
-bool JSSlotUtils::implantOpaqueProxy( KJS::ExecState *, QUObject *uo,
-				      const KJS::Value &v, const TQString &clazz )
+bool JSSlotUtils::implantOpaqueProxy( KJS::ExecState *, TQUObject *uo,
+				      const KJS::Value &v, const TTQString &clazz )
 {
     JSOpaqueProxy *prx = JSProxy::toOpaqueProxy( v.imp() );
     if ( !prx )
@@ -410,8 +410,8 @@ bool JSSlotUtils::implantOpaqueProxy( KJS::ExecState *, QUObject *uo,
     return true;
 }
 
-bool JSSlotUtils::implantObjectProxy( KJS::ExecState *, QUObject *uo,
-				      const KJS::Value &v, const TQString &clazz )
+bool JSSlotUtils::implantObjectProxy( KJS::ExecState *, TQUObject *uo,
+				      const KJS::Value &v, const TTQString &clazz )
 {
     JSObjectProxy *prx = JSProxy::toObjectProxy( v.imp() );
     if ( !prx )
@@ -424,7 +424,7 @@ bool JSSlotUtils::implantObjectProxy( KJS::ExecState *, QUObject *uo,
     return true;
 }
 
-int JSSlotUtils::findSignature( const TQString &sig )
+int JSSlotUtils::findSignature( const TTQString &sig )
 {
     // No args
     if ( sig.contains("()") )
@@ -444,46 +444,46 @@ int JSSlotUtils::findSignature( const TQString &sig )
     else if ( sig.contains("(double)") )
 	return SignatureDouble;
 
-    else if ( sig.contains("(const TQString&)") )
+    else if ( sig.contains("(const TTQString&)") )
 	return SignatureString;
-    else if ( sig.contains("(const TQCString&)") )
+    else if ( sig.contains("(const TTQCString&)") )
 	return SignatureCString;
     else if ( sig.contains("(const char*)") )
 	return SignatureCString;
     else if ( sig.contains("(const KURL&)") )
 	return SignatureURL;
-    else if ( sig.contains("(const TQColor&)") )
+    else if ( sig.contains("(const TTQColor&)") )
 	return SignatureColor;
-    else if ( sig.contains("(const TQPoint&)") )
+    else if ( sig.contains("(const TTQPoint&)") )
 	return SignaturePoint;
-    else if ( sig.contains("(const TQRect&)") )
+    else if ( sig.contains("(const TTQRect&)") )
 	return SignatureRect;
-    else if ( sig.contains("(const TQSize&)") )
+    else if ( sig.contains("(const TTQSize&)") )
 	return SignatureSize;
-    else if ( sig.contains("(const TQPixmap&)") )
+    else if ( sig.contains("(const TTQPixmap&)") )
 	return SignaturePixmap;
-    else if ( sig.contains("(const TQFont&)") )
+    else if ( sig.contains("(const TTQFont&)") )
 	return SignatureFont;
-    else if ( sig.contains("(const TQDate&)") )
+    else if ( sig.contains("(const TTQDate&)") )
 	return SignatureDate;
-    else if ( sig.contains("(const TQTime&)") )
+    else if ( sig.contains("(const TTQTime&)") )
 	return SignatureTime;
-    else if ( sig.contains("(const TQDateTime&)") )
+    else if ( sig.contains("(const TTQDateTime&)") )
 	return SignatureDateTime;
-    else if ( sig.contains("(const TQImage&)") )
+    else if ( sig.contains("(const TTQImage&)") )
 	return SignatureImage;
-    else if ( sig.contains("(TQWidget*)") )
-	return SignatureQWidget;
+    else if ( sig.contains("(TTQWidget*)") )
+	return SignatureTQWidget;
     // Two args
-    else if ( sig.contains("(const TQDate&, const TQDate&)") )
+    else if ( sig.contains("(const TTQDate&, const TTQDate&)") )
 	return SignatureDateDate;
-    else if ( sig.contains("(const TQColor&, const TQString&)") )
+    else if ( sig.contains("(const TTQColor&, const TTQString&)") )
 	return SignatureColorString;
 
-    else if ( sig.contains("(const TQString&,const TQString&,const TQString&)") )
+    else if ( sig.contains("(const TTQString&,const TTQString&,const TTQString&)") )
 	return SignatureStringStringString;
 
-    else if ( sig.contains("(const TQString&,const TQString&)") )
+    else if ( sig.contains("(const TTQString&,const TTQString&)") )
 	return SignatureStringString;
     else if ( sig.contains("(int,int)") )
 	return SignatureIntInt;
@@ -494,57 +494,57 @@ int JSSlotUtils::findSignature( const TQString &sig )
     else if ( sig.contains("(int,int,int,int,bool)") )
 	return SignatureIntIntIntIntBool;
 
-    else if ( sig.contains("(const TQString&,int)") )
+    else if ( sig.contains("(const TTQString&,int)") )
 	return SignatureStringInt;
-    else if ( sig.contains("(const TQString&,uint)") )
+    else if ( sig.contains("(const TTQString&,uint)") )
 	return SignatureStringInt;
 
     else if ( sig.contains("(const KURL&,const KURL&)") )
 	return SignatureURLURL;
-    else if ( sig.contains("(const KURL&,const TQString&)") )
+    else if ( sig.contains("(const KURL&,const TTQString&)") )
 	return SignatureURLString;
-    else if ( sig.contains("(const TQString&,const KURL&)") )
+    else if ( sig.contains("(const TTQString&,const KURL&)") )
 	return SignatureStringURL;
-    else if ( sig.contains("(const TQRect&,bool)") )
+    else if ( sig.contains("(const TTQRect&,bool)") )
 	return SignatureRectBool;
-    else if ( sig.contains("(const TQString&,bool)") )
+    else if ( sig.contains("(const TTQString&,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 TQString&)") )
+    else if ( sig.contains("(int,int,const TTQString&)") )
 	return SignatureIntIntString;
-    else if ( sig.contains("(const TQString&,bool,int)") )
+    else if ( sig.contains("(const TTQString&,bool,int)") )
 	return SignatureStringBoolInt;
-    else if ( sig.contains("(const TQString&,bool,bool)") )
+    else if ( sig.contains("(const TTQString&,bool,bool)") )
 	return SignatureStringBoolBool;
-    else if ( sig.contains("(const TQString&,int,int)") )
+    else if ( sig.contains("(const TTQString&,int,int)") )
 	return SignatureStringIntInt;
-    else if ( sig.contains("(int,const TQColor&,bool)") )
+    else if ( sig.contains("(int,const TTQColor&,bool)") )
 	return SignatureIntColorBool;
-    else if ( sig.contains("(int,const TQColor&)") )
+    else if ( sig.contains("(int,const TTQColor&)") )
 	return SignatureIntColor;
 
     else if ( sig.contains("(int,int,float,float)") )
 	return SignatureIntIntFloatFloat;
-    else if ( sig.contains("(const TQString&,bool,bool,bool)") )
+    else if ( sig.contains("(const TTQString&,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("TQString") || sig.contains("TQColor") ||
+    if ( sig.contains("TTQString") || sig.contains("TTQColor") ||
 	sig.contains("int") || sig.contains("bool") ||
         sig.contains("float") || sig.contains("KURL") ||
-        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") )
+        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") )
 	   return SignatureCustom;
 
     kdWarning(80001) << "findSignature: not supported type " << sig << endl;
@@ -556,41 +556,41 @@ int JSSlotUtils::findSignature( const TQString &sig )
 KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const KJS::List &args,
 				    JSObjectProxyImp *proxyimp )
 {
-    QUObject uo[ MAX_SUPPORTED_ARGS ] = { QUObject(), QUObject(), QUObject(),
-					  QUObject(), QUObject(), QUObject(),
-					  QUObject(), QUObject(), QUObject(),
-					  QUObject(), QUObject(), QUObject() };
+    TQUObject uo[ MAX_SUPPORTED_ARGS ] = { TQUObject(), TQUObject(), TQUObject(),
+					  TQUObject(), TQUObject(), TQUObject(),
+					  TQUObject(), TQUObject(), TQUObject(),
+					  TQUObject(), TQUObject(), TQUObject() };
 
     KJS::Value retValue;
     JSObjectProxy *proxy = proxyimp->objectProxy();
-    TQCString slotname( proxyimp->slotName() );
+    TTQCString slotname( proxyimp->slotName() );
     int sigid = proxyimp->signature();
-    TQPtrList<uint> uintlist;
+    TTQPtrList<uint> uintlist;
     uintlist.setAutoDelete(true);
-    TQObject *obj = proxy->object();
+    TTQObject *obj = proxy->object();
     int slotid = obj->metaObject()->findSlot( slotname, true );
     if ( slotid == -1 )
     {
-	TQString msg = i18n( "Slot %1 was not found." ).arg( slotname );
+	TTQString msg = i18n( "Slot %1 was not found." ).arg( slotname );
   return throwError(exec, msg,KJS::ReferenceError);
     }
 
     if ( args.size() > MAX_SUPPORTED_ARGS )
     {
-	TQString msg = i18n( "Slots with more than %1 arguments are not supported." ).arg( MAX_SUPPORTED_ARGS );
+	TTQString 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];
-    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];
+    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];
     
     bool notsupported = true;
 
@@ -604,7 +604,7 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
 		implantBool( exec, uo+1, args[0] );
 		break;
 	    case SignatureString:
-		implantQString( exec, uo+1, args[0] );
+		implantTQString( exec, uo+1, args[0] );
 		break;
 	    case SignatureCString:
 		implantCString( exec, uo+1, args[0] );
@@ -640,7 +640,7 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
 		implantInt( exec, uo+2, args[1] );
 		break;
 	    case SignatureStringInt:
-		implantQString( exec, uo+1, args[0] );
+		implantTQString( exec, uo+1, args[0] );
 		implantInt( exec, uo+2, args[1] );
 		break;
 	    case SignatureRectBool:
@@ -648,11 +648,11 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
 		implantBool( exec, uo+2, args[1] );
 		break;
 	    case SignatureStringString:
-		implantQString( exec, uo+1, args[0] );
-		implantQString( exec, uo+2, args[1] );
+		implantTQString( exec, uo+1, args[0] );
+		implantTQString( exec, uo+2, args[1] );
 		break;
 	    case SignatureStringBool:
-		implantQString( exec, uo+1, args[0] );
+		implantTQString( exec, uo+1, args[0] );
 		implantBool( exec, uo+2, args[1] );
 		break;
 	    case SignatureIntColor:
@@ -665,10 +665,10 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
 		break;
 	    case SignatureURLString:
 		implantURL( exec, uo+1, args[0], &url[0] );
-		implantQString( exec, uo+2, args[1] );
+		implantTQString( exec, uo+2, args[1] );
 		break;
 	    case SignatureStringURL:
-		implantQString( exec, uo+1, args[0] );
+		implantTQString( exec, uo+1, args[0] );
 		implantURL( exec, uo+2, args[1], &url[0] );
 		break;
 
@@ -686,16 +686,16 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
 	    case SignatureStringStringString:
 		if ( args.size() != 3 )
 		    return KJS::Null();
-		implantQString( exec, uo+1, args[0] );
-		implantQString( exec, uo+2, args[1] );
-		implantQString( exec, uo+3, args[2] );
+		implantTQString( exec, uo+1, args[0] );
+		implantTQString( exec, uo+2, args[1] );
+		implantTQString( exec, uo+3, args[2] );
 		break;
 	    case SignatureIntIntString:
 		if ( args.size() != 3 )
 		    return KJS::Null();
 		implantInt( exec, uo+1, args[0] );
 		implantInt( exec, uo+2, args[1] );
-		implantQString( exec, uo+3, args[2] );
+		implantTQString( exec, uo+3, args[2] );
 		break;
 	    case SignatureIntIntIntInt:
 		if ( args.size() != 4 )
@@ -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(')');
-        TQString fargs = slotname.mid( argsStart+1, argsEnd-argsStart-1 );
+        TTQString fargs = slotname.mid( argsStart+1, argsEnd-argsStart-1 );
 
 	// Iterate over the parameters
-        TQStringList argList = TQStringList::split(',', fargs, true);
-	uint count = QMIN( argList.count(), MAX_SUPPORTED_ARGS );
+        TTQStringList argList = TTQStringList::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;
 
-	    TQString arg = argList[idx];
+	    TTQString 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("TQStringList") == 1 )
+	    else if ( arg.contains("TTQStringList") == 1 )
 		implantStringList( exec, uo+1+idx, args[idx], &slst[idx] );
-	    else if ( arg.contains("TQString") == 1 )
-		implantQString(exec,  uo+1+idx, args[idx] );
-	    else if ( arg.contains("TQCString") == 1 )
+	    else if ( arg.contains("TTQString") == 1 )
+		implantTQString(exec,  uo+1+idx, args[idx] );
+	    else if ( arg.contains("TTQCString") == 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("TQColor") == 1 )
+	    else if ( arg.contains("TTQColor") == 1 )
 	        implantColor( exec, uo+1+idx, args[idx], &color[idx] );
-	    else if ( arg.contains("TQPoint") == 1 )
+	    else if ( arg.contains("TTQPoint") == 1 )
 		implantPoint( exec, uo+1+idx, args[idx], &point[idx] );
-	   else if ( arg.contains("TQSize") == 1 )
+	   else if ( arg.contains("TTQSize") == 1 )
 		implantSize( exec, uo+1+idx, args[idx], &size[idx] );
-	   else if ( arg.contains("TQRect") == 1 )
+	   else if ( arg.contains("TTQRect") == 1 )
 		implantRect( exec, uo+1+idx, args[idx], &rect[idx] );
-	   else if ( arg.contains("TQDate") == 1 )
+	   else if ( arg.contains("TTQDate") == 1 )
 		implantDate( exec, uo+1+idx, args[idx], &date[idx] );
-	   else if ( arg.contains("TQTime") == 1 )
+	   else if ( arg.contains("TTQTime") == 1 )
 		implantTime( exec, uo+1+idx, args[idx], &time[idx] );
-	   else if ( arg.contains("TQDateTime") == 1 )
+	   else if ( arg.contains("TTQDateTime") == 1 )
 		implantDateTime( exec, uo+1+idx, args[idx], &datetime[idx] );
-	   else if ( arg.contains("TQPixmap") == 1 )
+	   else if ( arg.contains("TTQPixmap") == 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("TQObject") == 1 ) || ( arg.contains("TQWidget") == 1 ) )
+	    else if ( ( arg.contains("TTQObject") == 1 ) || ( arg.contains("TTQWidget") == 1 ) )
 	   {
-	   	kdDebug( 80001 ) << "Doing a TQObject" << endl;
-		notsupported = !implantObjectProxy( exec, uo+1+idx, args[idx], "TQObject" );
+	   	kdDebug( 80001 ) << "Doing a TTQObject" << endl;
+		notsupported = !implantObjectProxy( exec, uo+1+idx, args[idx], "TTQObject" );
 	   }
-	    else if ( TQVariant::nameToType(arg.latin1()) != TQVariant::Invalid ) {
+	    else if ( TTQVariant::nameToType(arg.latin1()) != TTQVariant::Invalid ) {
 		bool ok = implantValueProxy( exec, uo+1+idx, args[idx], arg );
 		if ( !ok ) {
 		    notsupported = true;
@@ -802,18 +802,18 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
 		}
 		else
 		{
-			kdDebug( 80001 ) << "Implanted the variant " << static_QUType_QVariant.get(uo+1+idx).isValid() << endl;
+			kdDebug( 80001 ) << "Implanted the variant " << static_QUType_TQVariant.get(uo+1+idx).isValid() << endl;
 		}
 	    }
-	    /* else if ( ( arg.contains("TQVariant") == 1 ) ||
-	        ( arg.contains("TQPen") == 1 ) || (arg.contains("TQFont") == 1 )  ||
-		( arg.contains("TQBrush") == 1 ))
-		if(!implantQVariant(exec,  uo+1+idx, args[idx] )){
+	    /* else if ( ( arg.contains("TTQVariant") == 1 ) ||
+	        ( arg.contains("TTQPen") == 1 ) || (arg.contains("TTQFont") == 1 )  ||
+		( arg.contains("TTQBrush") == 1 ))
+		if(!implantTQVariant(exec,  uo+1+idx, args[idx] )){
 		    notsupported = true;
 		    break;
 		} */
 	    else if ( arg.contains("*") == 1 ) {
-		TQRegExp re("(\\w+)\\*");
+		TTQRegExp 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
-    TQCString ret( proxyimp->returnType() );
+    TTQCString ret( proxyimp->returnType() );
     if ( ret.isEmpty() ) {
 	// Basic type (void, int etc.)
 	return extractValue( exec, uo );
@@ -853,8 +853,8 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
     // Object type
     kdDebug(80001) << "Handling a pointer return of type " << ret << endl;
 
-    if ( proxy->part()->factory()->isQObject(ret) ) {
-	kdDebug(80001) << "Return type is TQObject " << ret << endl;
+    if ( proxy->part()->factory()->isTQObject(ret) ) {
+	kdDebug(80001) << "Return type is TTQObject " << ret << endl;
 	return extractValue( exec, uo, proxy );
     }
 
diff --git a/kjsembed/slotutils.h b/kjsembed/slotutils.h
index 7e5650d6..5119d35f 100644
--- a/kjsembed/slotutils.h
+++ b/kjsembed/slotutils.h
@@ -26,7 +26,7 @@
 #include <kjs/object.h>
 #include <kjsembed/jsbinding.h>
 
-class TQObject;
+class TTQObject;
 
 namespace KJS { class Interpreter; }
 
@@ -60,7 +60,7 @@ public:
 	SignatureURL, SignatureColor, SignaturePoint, SignatureRect,
 	SignatureSize, SignaturePixmap, SignatureFont, SignatureImage,
 
-	SignatureQWidget,
+	SignatureTQWidget,
 
 	SignatureIntInt, SignatureStringInt, SignatureRectBool,
 	SignatureStringString, SignatureDateDate, SignatureColorString,
@@ -82,81 +82,81 @@ public:
      * Returns the method id for the specified slot signature. If there is no match
      * then -1 is returned.
      */
-    static int findSignature( const TQString &sig );
+    static int findSignature( const TTQString &sig );
 
     /** Connects the specified signal to the specified slot. */
-    static bool connect( TQObject *sender, const char *sig, TQObject *recv, const char *dest );
+    static bool connect( TTQObject *sender, const char *sig, TTQObject *recv, const char *dest );
 
     static KJS::Boolean disconnect( KJS::ExecState *exec, KJS::Object &self,
-			     TQObject *sender, const char *sig, TQObject *recv, const char *dest );
+			     TTQObject *sender, const char *sig, TTQObject *recv, const char *dest );
 
     static KJS::Value invokeSlot( KJS::ExecState *exec, KJS::Object &self, const KJS::List&args,
 				  JSObjectProxyImp *proxyimp );
 
-    /** Returns the value of the QUObject or KJS::Null. */
-    static KJS::Value extractValue( KJS::ExecState *exec, QUObject *uo, JSObjectProxy *parent=0 );
-
-    /** Implant an int into a QUObject. */
-    static void implantInt( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v );
-    /** Implant a TQString into a QUObject. */
-    static void implantQString( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v );
-    /** Implant a bool into a QUObject. */
-    static void implantBool( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v );
-    /** Implant a double into a QUObject. */
-    static void implantDouble( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v );
-    /** Implant a C string into a QUObject. */
-    static void implantCString( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v );
-
-    /** Implant a KURL into a QUObject. */
-    static void implantURL( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, KURL *url );
-    /** Implant a TQColor into a QUObject. */
-    static void implantColor( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQColor *color );
-    /** Implant a TQPoint into a QUObject. */
-    static void implantPoint( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQPoint *point );
-    /** Implant a TQRect into a QUObject. */
-    static void implantRect( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQRect *rect );
-    /** Implant a TQSize into a QUObject. */
-    static void implantSize( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQSize *size );
-
-    /** Implant a TQDate into a QUObject. */
-    static void implantDate( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQDate *date );
-    /** Implant a TQTime into a QUObject. */
-    static void implantTime( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQTime *time );
-    /** Implant a TQDateTime into a QUObject. */
-    static void implantDateTime( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQDateTime *datetime );
-    /** Implant a TQPixmap into a QUObject. */
-    static void implantPixmap( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQPixmap *pix );
+    /** Returns the value of the TQUObject or KJS::Null. */
+    static KJS::Value extractValue( KJS::ExecState *exec, TQUObject *uo, JSObjectProxy *parent=0 );
+
+    /** Implant an int into a TQUObject. */
+    static void implantInt( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v );
+    /** Implant a TTQString 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 );
+    /** Implant a double into a TQUObject. */
+    static void implantDouble( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v );
+    /** Implant a C string into a TQUObject. */
+    static void implantCString( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v );
+
+    /** 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 value proxy into a QUObject. The type specified in the clazz parameter
+     * 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, QUObject *uo,
-				   const KJS::Value &v, const TQString &clazz);
+    static bool implantValueProxy( KJS::ExecState *exec, TQUObject *uo,
+				   const KJS::Value &v, const TTQString &clazz);
 
-    /** Implant a TQVariant into a QUObject. */
-    static bool implantQVariant( KJS::ExecState *exec, QUObject *uo,const KJS::Value &v);
+    /** Implant a TTQVariant into a TQUObject. */
+    static bool implantTQVariant( KJS::ExecState *exec, TQUObject *uo,const KJS::Value &v);
 
     /**
-     * Implant an opaque proxy into a QUObject. The type specified in the
+     * Implant an opaque 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 implantOpaqueProxy( KJS::ExecState *, QUObject *uo,
-				    const KJS::Value &v, const TQString &clazz );
+    static bool implantOpaqueProxy( KJS::ExecState *, TQUObject *uo,
+				    const KJS::Value &v, const TTQString &clazz );
 
     /**
-     * Implant an object proxy into a QUObject. The object proxy'd by the specified value
+     * 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, QUObject *uo,
-				    const KJS::Value &v, const TQString &clazz );
-    /** Implant a TQString into a QUObject. */ 
-    static void implantStringList(KJS::ExecState *exec, QUObject *uo, 
-				  const KJS::Value &v, TQStringList *lst );
+    static bool implantObjectProxy( KJS::ExecState *exec, TQUObject *uo,
+				    const KJS::Value &v, const TTQString &clazz );
+    /** Implant a TTQString into a TQUObject. */ 
+    static void implantStringList(KJS::ExecState *exec, TQUObject *uo, 
+				  const KJS::Value &v, TTQStringList *lst );
     
-    /** Implant a char* into a QUObject. */ 
-    static void implantCharStar( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v );
+    /** Implant a char* into a TQUObject. */ 
+    static void implantCharStar( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v );
 
 private:
     JSSlotUtils();
diff --git a/kjsembed/tests/dcop.js b/kjsembed/tests/dcop.js
index 03e8ac87..7f0643cf 100644
--- a/kjsembed/tests/dcop.js
+++ b/kjsembed/tests/dcop.js
@@ -10,7 +10,7 @@ if ( d.attach())
 	if( d.isAttached() )
 	{
 		println( "send test..." )
-		if (d.send( "kded","kmilod", "displayText(QString)", "Test") )
+		if (d.send( "kded","kmilod", "displayText(TQString)", "Test") )
 			println("send worked...");
 		else
 			println("send failed...");
@@ -18,11 +18,11 @@ if ( d.attach())
 		var dta = d.call( "kded","kmilod", "pollMilliSeconds()");
 		println( dta );
 		println( "call test with args" )
-		var dta = d.call( "KWeatherService","WeatherService", "wind(QString)", "KMKE");
+		var dta = d.call( "KWeatherService","WeatherService", "wind(TQString)", "KMKE");
 		println( dta );
 
 
-		var ref = d.call("rssservice", "RSSService", "add(QString)", "http://www.freshmeat.net/rdf.xml");
+		var ref = d.call("rssservice", "RSSService", "add(TQString)", "http://www.freshmeat.net/rdf.xml");
 		if( ref )
 		{
 			println( "Got ref");
diff --git a/kjsembed/tests/plugin.js b/kjsembed/tests/plugin.js
index 04d91a4f..900856b0 100644
--- a/kjsembed/tests/plugin.js
+++ b/kjsembed/tests/plugin.js
@@ -29,7 +29,7 @@ if( foo2.mode() == foo1.On )
 	
 }
 
-var foo4 = new MyCustomQObject(this);
+var foo4 = new MyCustomTQObject(this);
 
 foo4.mode = foo4.On;
 foo4.thing = "Test";
diff --git a/kjsembed/tests/test.ui b/kjsembed/tests/test.ui
index fb9cdc26..477d8c2d 100644
--- a/kjsembed/tests/test.ui
+++ b/kjsembed/tests/test.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -30,12 +30,12 @@
                 <string>&lt;h1&gt;Test Dialog&lt;/h1&gt;</string>
             </property>
         </widget>
-        <widget class="QDateEdit" row="2" column="1" rowspan="1" colspan="2">
+        <widget class="TQDateEdit" row="2" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>DateEdit1</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -43,7 +43,7 @@
                 <string>Line edit:</string>
             </property>
         </widget>
-        <widget class="QTimeEdit" row="3" column="1" rowspan="1" colspan="2">
+        <widget class="TQTimeEdit" row="3" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TimeEdit1</cstring>
             </property>
@@ -53,7 +53,7 @@
                 <cstring>KLineEdit1</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TextLabel2_3</cstring>
             </property>
@@ -61,7 +61,7 @@
                 <string>Date edit:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>TextLabel2_4</cstring>
             </property>
@@ -86,7 +86,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="4" column="2">
+        <widget class="TQPushButton" row="4" column="2">
             <property name="name">
                 <cstring>pushButton1</cstring>
             </property>
diff --git a/kjsembed/tests/test_childevent.js b/kjsembed/tests/test_childevent.js
index 363f3492..d1ef2746 100644
--- a/kjsembed/tests/test_childevent.js
+++ b/kjsembed/tests/test_childevent.js
@@ -1,15 +1,15 @@
 #!/usr/bin/env kjscmd
 
 /**
- * Test of QChildEvent handling. This example will not work at the moment
+ * Test of TQChildEvent handling. This example will not work at the moment
  * because support for these events is disabled. The problem occurs because we
  * reenter the interpreter if the object was created by js.
  */
 
-var top = new QVBox();
-var hbox = new QHBox(top, 'button_hbox');
-var add = new QPushButton(hbox, 'add_button');
-var del = new QPushButton(hbox, 'del_button');
+var top = new TQVBox();
+var hbox = new TQHBox(top, 'button_hbox');
+var add = new TQPushButton(hbox, 'add_button');
+var del = new TQPushButton(hbox, 'del_button');
 
 add.text = 'Add';
 del.text = 'Delete';
@@ -26,7 +26,7 @@ top.childRemoveEvent = function(ev)
 
 top.addSlot = function()
 {
-  l = new QLabel( this, 'demo_label' );
+  l = new TQLabel( this, 'demo_label' );
   l.text = 'Hello World';
   l.show();
 }
diff --git a/kjsembed/tests/test_connect.js b/kjsembed/tests/test_connect.js
index abeb14bb..fbd0aae4 100644
--- a/kjsembed/tests/test_connect.js
+++ b/kjsembed/tests/test_connect.js
@@ -1,9 +1,9 @@
-var box = new QHBox( 'tree_view' );
+var box = new TQHBox( 'tree_view' );
 box.margin = 6;
 
 var led = new KLed( box );
 
-var btn = new QCheckBox(box);
+var btn = new TQCheckBox(box);
 btn.text = 'Light'
 
 btn.connect( 'toggled(bool)', led, 'toggle()' );
diff --git a/kjsembed/tests/test_connectsignal.js b/kjsembed/tests/test_connectsignal.js
index e0392375..0e6bff5f 100644
--- a/kjsembed/tests/test_connectsignal.js
+++ b/kjsembed/tests/test_connectsignal.js
@@ -1,9 +1,9 @@
-var box = new QHBox( 'tree_view' );
+var box = new TQHBox( 'tree_view' );
 box.margin = 6;
 
 var led = new KLed( box );
-var check = new QCheckBox(box);
-var check2 = new QCheckBox(box);
+var check = new TQCheckBox(box);
+var check2 = new TQCheckBox(box);
 
 check.text = 'Light';
 check2.text = 'Bounce';
diff --git a/kjsembed/tests/test_customslots.js b/kjsembed/tests/test_customslots.js
index 0c1dd05c..9500a4d2 100644
--- a/kjsembed/tests/test_customslots.js
+++ b/kjsembed/tests/test_customslots.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env kjscmd
 
-var dateTime = new QDateTimeEdit(this);
-dateTime.connect( dateTime, 'valueChanged(const QDateTime&)', this, 'changed');
+var dateTime = new TQDateTimeEdit(this);
+dateTime.connect( dateTime, 'valueChanged(const TQDateTime&)', this, 'changed');
 
 var jsDate = new Date();
 dateTime.setDateTime( jsDate );
diff --git a/kjsembed/tests/test_datetime.js b/kjsembed/tests/test_datetime.js
index b35853ad..417e9844 100644
--- a/kjsembed/tests/test_datetime.js
+++ b/kjsembed/tests/test_datetime.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env kjscmd
 
 var realDate = new Date();
-var dtEdit = new QDateTimeEdit(this);
+var dtEdit = new TQDateTimeEdit(this);
 dtEdit.dateTime =  realDate;
 
 var dt = dtEdit.dateTime;
diff --git a/kjsembed/tests/test_dcop_interface.js b/kjsembed/tests/test_dcop_interface.js
index f0da8c27..37c11d5d 100755
--- a/kjsembed/tests/test_dcop_interface.js
+++ b/kjsembed/tests/test_dcop_interface.js
@@ -37,9 +37,9 @@ function makeRef()
 
 var dcop = new DCOPInterface(this, "someInterface");  	// Create the DCOP object.
 dcop.publish("void exitJavascript(int)");		// Publish a javascript function.
-dcop.publish("QString doSomthing(QString,int)");	// Publish another javascript function.
+dcop.publish("TQString doSomthing(TQString,int)");	// Publish another javascript function.
 dcop.publish("int test()");
-dcop.publish("QPixmap pixmap(QString)");
+dcop.publish("TQPixmap pixmap(TQString)");
 dcop.publish("DCOPRef makeRef()");
 
 application.exec();					// Start the event loop
diff --git a/kjsembed/tests/test_dcopref2.js b/kjsembed/tests/test_dcopref2.js
index 02cd3df3..349364d0 100644
--- a/kjsembed/tests/test_dcopref2.js
+++ b/kjsembed/tests/test_dcopref2.js
@@ -11,7 +11,7 @@ if ( d.attach())
 	{
 		var ref = new DCOPRef();
 		ref.setRef( "KWeatherService", "WeatherService" );
-		println ( ref.call( "date(QString)", "KMKE") );
+		println ( ref.call( "date(TQString)", "KMKE") );
 
 	}
 	else
diff --git a/kjsembed/tests/test_dcopstart.js b/kjsembed/tests/test_dcopstart.js
index e2dee415..abba0e9f 100644
--- a/kjsembed/tests/test_dcopstart.js
+++ b/kjsembed/tests/test_dcopstart.js
@@ -11,7 +11,7 @@ if ( d.attach())
 		if( app != ""  )
 		{
 			println( "Got ref");
-			var worked = d.send(app, "EditInterface#1","setText(QString)", "This is a test");
+			var worked = d.send(app, "EditInterface#1","setText(TQString)", "This is a test");
 			println("Returned a : " + worked);
 		}
 		else
diff --git a/kjsembed/tests/test_gc.js b/kjsembed/tests/test_gc.js
index aa1e11af..b3885c53 100755
--- a/kjsembed/tests/test_gc.js
+++ b/kjsembed/tests/test_gc.js
@@ -3,14 +3,14 @@ var arr = new Array();
 
 for( var idx = 0; idx < 500; ++idx )
 {
-	arr[idx] = new QLabel(this);
+	arr[idx] = new TQLabel(this);
 	arr[idx].text = "foo " + idx;
 }
 
 for( var idx = 0; idx < 500; ++idx )
 {
 	println( arr[idx].text );
-	arr[idx] = new QLabel(this);
+	arr[idx] = new TQLabel(this);
 	arr[idx].text = "bar " + idx;	
 }
 
diff --git a/kjsembed/tests/test_kio.js b/kjsembed/tests/test_kio.js
index 11bd6a1c..0c0125e5 100755
--- a/kjsembed/tests/test_kio.js
+++ b/kjsembed/tests/test_kio.js
@@ -17,7 +17,7 @@ if ( ret ) {
   } else {
       print( 'Image ' + loc + ' is OK \n' );
   }
-  var lbl = new QLabel(this);
+  var lbl = new TQLabel(this);
   lbl.pixmap = img.pixmap();
   lbl.show();
 }
diff --git a/kjsembed/tests/test_kparts_args.js b/kjsembed/tests/test_kparts_args.js
index aee1745e..a719590a 100644
--- a/kjsembed/tests/test_kparts_args.js
+++ b/kjsembed/tests/test_kparts_args.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env kjscmd
 
 var mw = new KMainWindow();
-var box = new QVBox( mw );
+var box = new TQVBox( mw );
 mw.setCentralWidget( box );
 
 var args = [ "WIDTH=300", "HEIGHT=250", "CODE=TestApplet.class", "CLASSPATH=.", "TEXT=Foobar" ]
diff --git a/kjsembed/tests/test_kropart.js b/kjsembed/tests/test_kropart.js
index 1e2d4344..8867580e 100644
--- a/kjsembed/tests/test_kropart.js
+++ b/kjsembed/tests/test_kropart.js
@@ -1,4 +1,4 @@
-var box = new QHBox( this );
+var box = new TQHBox( this );
 var view = Factory.createROPart( "cat", box, "view" );
 
 box.show();
diff --git a/kjsembed/tests/test_pixmap_slots.js b/kjsembed/tests/test_pixmap_slots.js
index f2ca40fa..db32ace2 100644
--- a/kjsembed/tests/test_pixmap_slots.js
+++ b/kjsembed/tests/test_pixmap_slots.js
@@ -4,7 +4,7 @@ var img = new Image();
 img.load("test.png");
 
 var pix = img.pixmap();
-var btn = new QToolButton(this);
+var btn = new TQToolButton(this);
 btn.pixmap =  pix;
 btn.setIcon( pix );
 btn.show();
diff --git a/kjsembed/tests/test_popupmenu.js b/kjsembed/tests/test_popupmenu.js
index 6d60231c..376ac638 100644
--- a/kjsembed/tests/test_popupmenu.js
+++ b/kjsembed/tests/test_popupmenu.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env kjscmd
-var menu = new QPopupMenu(this);
-var subMenu = new QPopupMenu(menu);
+var menu = new TQPopupMenu(this);
+var subMenu = new TQPopupMenu(menu);
 var pix = new Pixmap();
 pix.resize(12,12);
 pix.fill("blue");
diff --git a/kjsembed/tests/test_qcanvas.js b/kjsembed/tests/test_qcanvas.js
index c5ffd7f9..4e17a5ce 100644
--- a/kjsembed/tests/test_qcanvas.js
+++ b/kjsembed/tests/test_qcanvas.js
@@ -1,24 +1,24 @@
 #!/usr/bin/env kjscmd
 
-c = new QCanvas();
+c = new TQCanvas();
 
-item = new QCanvasText( '<font="blue">hi</font>', c );
+item = new TQCanvasText( '<font="blue">hi</font>', c );
 item.move( 50, 50 );
 item.show();
 
-item = new QCanvasText( '<font="blue">hi</font>', c );
+item = new TQCanvasText( '<font="blue">hi</font>', c );
 item.move( 150, 50 );
 item.show();
 
-item = new QCanvasText( '<font="blue">hixxx</font>', c );
+item = new TQCanvasText( '<font="blue">hixxx</font>', c );
 item.move( 50, 150 );
 item.show();
 
-item = new QCanvasText( '<font="blue">hixxxxxxx</font>', c );
+item = new TQCanvasText( '<font="blue">hixxxxxxx</font>', c );
 item.move( 150, 150 );
 item.show();
 
-view = new QCanvasView();
+view = new TQCanvasView();
 view.setCanvas( c );
 
 view.update();
diff --git a/kjsembed/tests/test_qcombobox.js b/kjsembed/tests/test_qcombobox.js
index 03111692..d8a9790a 100644
--- a/kjsembed/tests/test_qcombobox.js
+++ b/kjsembed/tests/test_qcombobox.js
@@ -1,5 +1,5 @@
-var h=new QHBox(this);
-var combo = new QComboBox(h, "combo");
+var h=new TQHBox(this);
+var combo = new TQComboBox(h, "combo");
 combo.insertItem("Item 1");
 combo.insertItem("Item 2");
 combo.insertItem("Item 3");
diff --git a/kjsembed/tests/test_qdir.js b/kjsembed/tests/test_qdir.js
index c51f15e0..8b214fb9 100644
--- a/kjsembed/tests/test_qdir.js
+++ b/kjsembed/tests/test_qdir.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env kjscmd
 
-var dir = new QDir(); // CWD
+var dir = new TQDir(); // CWD
 println( dir.path() );
 
 var files = dir.entryList( '*.js' );
diff --git a/kjsembed/tests/test_qframe.js b/kjsembed/tests/test_qframe.js
index 218b2e7f..cf888b23 100644
--- a/kjsembed/tests/test_qframe.js
+++ b/kjsembed/tests/test_qframe.js
@@ -1,27 +1,27 @@
 #!/usr/bin/env kjscmd
 var mw = new KMainWindow(this);
-var hbox = new QHBox( mw );
+var hbox = new TQHBox( mw );
 
-var f1 = new QLabel( hbox );
-f1.frameShape = QLabel.Box;
-f1.frameShadow = QLabel.Raised;
+var f1 = new TQLabel( hbox );
+f1.frameShape = TQLabel.Box;
+f1.frameShadow = TQLabel.Raised;
 f1.lineWidth = 4;
 f1.margin = 4;
 f1.midLineWidth = 1;
 f1.paletteBackgroundColor = "red";
 f1.text = "Frame 1";
 
-var f2 = new QLabel( hbox );
-f2.frameShape = QLabel.WinPanel;
-f2.frameShadow = QLabel.Sunken;
+var f2 = new TQLabel( hbox );
+f2.frameShape = TQLabel.WinPanel;
+f2.frameShadow = TQLabel.Sunken;
 f2.lineWidth = 4;
 f2.margin = 4;
 f2.midLineWidth = 1;
 f2.paletteBackgroundColor = "white";
 f2.text = "Frame 2";
 
-var f3 = new QLabel( hbox );
-f3.frameShape = QLabel.Box;
+var f3 = new TQLabel( hbox );
+f3.frameShape = TQLabel.Box;
 f3.lineWidth = 4;
 f3.margin = 4;
 f3.midLineWidth = 1;
diff --git a/kjsembed/tests/test_qlistview.js b/kjsembed/tests/test_qlistview.js
index 2f8f37bf..cec1ef55 100644
--- a/kjsembed/tests/test_qlistview.js
+++ b/kjsembed/tests/test_qlistview.js
@@ -1,21 +1,21 @@
-var lv = new QListView();
+var lv = new TQListView();
 lv.rootIsDecorated = true;
 lv.addColumn('Name');
 lv.addColumn('Description');
 
-var i = new QListViewItem( lv );
+var i = new TQListViewItem( lv );
 i.setText( 0, 'One' );
 i.setText( 1, 'First item' );
 
-var j = new QListViewItem( lv );
+var j = new TQListViewItem( lv );
 j.setText( 0, 'Two' );
 j.setText( 1, 'Second item' );
 
-var k = new QListViewItem( i );
+var k = new TQListViewItem( i );
 k.setText( 0, 'Three' );
 k.setText( 1, 'Third item' );
 
-var l = new QCheckListItem( lv );
+var l = new TQCheckListItem( lv );
 l.setText(0, 'Four' );
 
 lv.show();
diff --git a/kjsembed/tests/test_qtabctl.js b/kjsembed/tests/test_qtabctl.js
index 60eebfdf..bb4ff563 100755
--- a/kjsembed/tests/test_qtabctl.js
+++ b/kjsembed/tests/test_qtabctl.js
@@ -1,13 +1,13 @@
 #!/usr/bin/env kjscmd
 
-var vbox = new QVBox();
-var tw = new QTabWidget(vbox);
-var okButton = new QToolButton(vbox);
+var vbox = new TQVBox();
+var tw = new TQTabWidget(vbox);
+var okButton = new TQToolButton(vbox);
 
 okButton.text = "Ok";
 
-var c1 = new QToolButton( tw );
-var c2 = new QToolButton( tw );
+var c1 = new TQToolButton( tw );
+var c2 = new TQToolButton( tw );
 
 function tabchanged(q) {
      alert( "Tab Changed, " + q.text );
@@ -19,7 +19,7 @@ c2.text = "Tab2's button";
 tw.addTab(c1, "1");
 tw.addTab(c2, "2");
 
-vbox.connect(tw, "currentChanged(QWidget*)", this, "tabchanged");
+vbox.connect(tw, "currentChanged(TQWidget*)", this, "tabchanged");
 vbox.connect(okButton, "clicked()", this, "exit");
 vbox.show();
 
diff --git a/kjsembed/tests/test_qtimeedit.js b/kjsembed/tests/test_qtimeedit.js
index 632c4929..1dc91c7d 100644
--- a/kjsembed/tests/test_qtimeedit.js
+++ b/kjsembed/tests/test_qtimeedit.js
@@ -1,5 +1,5 @@
-var h = new QHBox(this);
-var dt = new QTimeEdit(h, 'tc');
+var h = new TQHBox(this);
+var dt = new TQTimeEdit(h, 'tc');
 var n = new Date(); // now
 
 dt.time = n; // set the control to now
diff --git a/kjsembed/tests/test_qtimeedit2.js b/kjsembed/tests/test_qtimeedit2.js
index 825fa10f..c69e24c3 100644
--- a/kjsembed/tests/test_qtimeedit2.js
+++ b/kjsembed/tests/test_qtimeedit2.js
@@ -1,13 +1,13 @@
-var vbox=new QVBox();
-var te=new QTimeEdit(vbox);
-var okButton=new QToolButton(vbox);
+var vbox=new TQVBox();
+var te=new TQTimeEdit(vbox);
+var okButton=new TQToolButton(vbox);
 okButton.text="Ok";
 
 function TimeChanged(q) {
     alert("Time Changed: " +q);
 }
 
-vbox.connect(te, "valueChanged(const QTime&)", this, "TimeChanged");
+vbox.connect(te, "valueChanged(const TQTime&)", this, "TimeChanged");
 vbox.connect(okButton, "clicked()", this, "exit");
 vbox.show();
 application.exec();
diff --git a/kjsembed/tests/test_qtoolbox.js b/kjsembed/tests/test_qtoolbox.js
index c56e1d4a..31f5b1f2 100755
--- a/kjsembed/tests/test_qtoolbox.js
+++ b/kjsembed/tests/test_qtoolbox.js
@@ -1,10 +1,10 @@
 #!/usr/bin/env kjscmd
 
-var vbox = new QVBox(this);
-var tb = new QToolBox(vbox);
+var vbox = new TQVBox(this);
+var tb = new TQToolBox(vbox);
 
-var c1 = new QPushButton( tb );
-var c2 = new QPushButton( tb );
+var c1 = new TQPushButton( tb );
+var c2 = new TQPushButton( tb );
 
 function itemchanged(idx) {
      alert( "Tab Changed, " + tb.item(idx).text );
diff --git a/kjsembed/tests/test_splashscreen.js b/kjsembed/tests/test_splashscreen.js
index bb465df0..fe2477b5 100644
--- a/kjsembed/tests/test_splashscreen.js
+++ b/kjsembed/tests/test_splashscreen.js
@@ -1,5 +1,5 @@
-var lab = new QLabel(this);
-var splash = new QSplashScreen(this);
+var lab = new TQLabel(this);
+var splash = new TQSplashScreen(this);
 var pix = new Pixmap();
 pix.resize(128,128);
 pix.fill("blue");
diff --git a/kjsembed/tools/Doxyfile b/kjsembed/tools/Doxyfile
index e2686a09..38387502 100644
--- a/kjsembed/tools/Doxyfile
+++ b/kjsembed/tools/Doxyfile
@@ -171,7 +171,7 @@ SHOW_INCLUDE_FILES     = YES
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
 # will interpret the first line (until the first dot) of a JavaDoc-style 
 # comment as the brief description. If set to NO, the JavaDoc 
-# comments  will behave just like the Qt-style comments (thus requiring an 
+# comments  will behave just like the Qt-style comments (thus retquiring an 
 # explict @brief command for a brief description.
 
 JAVADOC_AUTOBRIEF      = YES
@@ -265,10 +265,10 @@ SHOW_USED_FILES        = YES
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated 
+# 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.
 
-QUIET                  = YES
+TTQUIET                  = 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 
@@ -470,7 +470,7 @@ ENUM_VALUES_PER_LINE   = 4
 # If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
 # generated containing a tree-like index structure (just like the one that 
 # is generated for HTML Help). For this to work a browser that supports 
-# JavaScript and frames is required (for instance Netscape 4.0+ 
+# JavaScript and frames is retquired (for instance Netscape 4.0+ 
 # or Internet explorer 4.0+).
 
 GENERATE_TREEVIEW      = NO
diff --git a/kjsembed/tools/coverage/allqobjects.txt b/kjsembed/tools/coverage/allqobjects.txt
index 853e9e1d..b394f402 100644
--- a/kjsembed/tools/coverage/allqobjects.txt
+++ b/kjsembed/tools/coverage/allqobjects.txt
@@ -1,145 +1,145 @@
-QAccel 
-QAccessibleObject 
-QAction 
-QActionGroup 
-QApplication 
-QAquaStyle 
-QAssistantClient 
-QAxObject 
-QAxWidget 
-QBoxLayout 
-QButton 
-QButtonGroup 
-QCDEStyle 
-QCanvas 
-QCanvasView 
-QCheckBox 
-QClipboard 
-QColorDialog 
-QColorDrag 
-QComboBox 
-QCommonStyle 
-QCopChannel 
-QDataBrowser 
-QDataPump 
-QDataTable 
-QDataView 
-QDateEdit 
-QDateTimeEdit 
-QDateTimeEditBase 
-QDesktopWidget 
-QDial 
-QDialog 
-QDns 
-QDockArea 
-QDockWindow 
-QDoubleValidator 
-QDragObject 
-QEditorFactory 
-QErrorMessage 
-QEventLoop 
-QFileDialog 
-QFileIconProvider 
-QFontDialog 
-QFrame 
-QFtp 
-QGLWidget 
-QGrid 
-QGridLayout 
-QGridView 
-QGroupBox 
-QHBox 
-QHBoxLayout 
-QHButtonGroup 
-QHGroupBox 
-QHeader 
-QHttp 
-QIconDrag 
-QIconView 
-QImageDrag 
-QInputDialog 
-QIntValidator 
-QLCDNumber 
-QLabel 
-QLayout 
-QLineEdit 
-QListBox 
-QListView 
-QLocalFs 
-QMacStyle 
-QMainWindow 
-QMenuBar 
-QMessageBox 
-QMotif 
-QMotifDialog 
-QMotifPlusStyle 
-QMotifStyle 
-QMotifWidget 
-QMultiLineEdit 
-QNPInstance 
-QNPWidget 
-QNetworkOperation 
-QNetworkProtocol 
-QObject 
-QObjectCleanupHandler 
-QPlatinumStyle 
-QPopupMenu 
-QProcess 
-QProgressBar 
-QProgressDialog 
-QPushButton 
-QRadioButton 
-QRegExpValidator 
-QSGIStyle 
-QScrollBar 
-QScrollView 
-QServerSocket 
-QSessionManager 
-QSignal 
-QSignalMapper 
-QSizeGrip 
-QSlider 
-QSocket 
-QSocketNotifier 
-QSound 
-QSpinBox 
-QSplashScreen 
-QSplitter 
-QSqlDatabase 
-QSqlDriver 
-QSqlEditorFactory 
-QSqlForm 
-QStatusBar 
-QStoredDrag 
-QStyle 
-QStyleSheet 
-QTabBar 
-QTabDialog 
-QTabWidget 
-QTable 
-QTextBrowser 
-QTextDrag 
-QTextEdit 
-QTextView 
-QTimeEdit 
-QTimer 
-QToolBar 
-QToolBox 
-QToolButton 
-QToolTipGroup 
-QTranslator 
-QUriDrag 
-QUrlOperator 
-QVBox 
-QVBoxLayout 
-QVButtonGroup 
-QVGroupBox 
-QValidator 
-QWSKeyboardHandler 
-QWidget 
-QWidgetStack 
-QWindowsStyle 
-QWindowsXPStyle 
-QWizard 
-QWorkspace 
-QXtWidget 
+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 
diff --git a/kjsembed/tools/coverage/supported.txt b/kjsembed/tools/coverage/supported.txt
index dbf96951..f17ad56d 100644
--- a/kjsembed/tools/coverage/supported.txt
+++ b/kjsembed/tools/coverage/supported.txt
@@ -9,57 +9,57 @@ Painter
 Pen
 Pixmap
 PixmapLabel
-QBoxLayout
-QButtonGroup
-QCanvasView
-QCheckBox
-QComboBox
-QDataBrowser
-QDataTable
-QDataView
-QDateEdit
-QDateTimeEdit
-QDial
-QDialog
-QFrame
-QGrid
-QGroupBox
-QHBox
-QHBoxLayout
-QIconView
-QLCDNumber
-QLabel
-QLayout
-QLayoutWidget
-QLineEdit
-QListBox
-QListView
-QMainWindow
-QMultiLineEdit
-QObject
-QPopupMenu
-QProgressBar
-QPushButton
-QRadioButton
-QScrollBar
-QScrollView
-QSlider
-QSpinBox
-QSplitter
-QTabWidget
-QTable
-QTextBrowser
-QTextEdit
-QTextView
-QTimeEdit
-QTimer
-QToolBox
-QToolButton
-QVBox
-QVBoxLayout
-QWidget
-QWidgetStack
-QWizard
+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
 RangeError
 ReferenceError
 SqlDatabase
diff --git a/kjsembed/tools/coverage/unsupported.txt b/kjsembed/tools/coverage/unsupported.txt
index 1ea2eb7b..4e5f43ee 100644
--- a/kjsembed/tools/coverage/unsupported.txt
+++ b/kjsembed/tools/coverage/unsupported.txt
@@ -1,95 +1,95 @@
-QAccel MISSING
-QAccessibleObject MISSING
-QAction MISSING
-QActionGroup MISSING
-QApplication MISSING
-QAquaStyle MISSING
-QAssistantClient MISSING
-QAxObject MISSING
-QAxWidget MISSING
-QButton MISSING
-QCDEStyle MISSING
-QCanvas MISSING
-QClipboard MISSING
-QColorDialog MISSING
-QColorDrag MISSING
-QCommonStyle MISSING
-QCopChannel MISSING
-QDataPump MISSING
-QDateTimeEditBase MISSING
-QDesktopWidget MISSING
-QDns MISSING
-QDockArea MISSING
-QDockWindow MISSING
-QDoubleValidator MISSING
-QDragObject MISSING
-QEditorFactory MISSING
-QErrorMessage MISSING
-QEventLoop MISSING
-QFileDialog MISSING
-QFileIconProvider MISSING
-QFontDialog MISSING
-QFtp MISSING
-QGLWidget MISSING
-QGridLayout MISSING
-QGridView MISSING
-QHButtonGroup MISSING
-QHGroupBox MISSING
-QHeader MISSING
-QHttp MISSING
-QIconDrag MISSING
-QImageDrag MISSING
-QInputDialog MISSING
-QIntValidator MISSING
-QLocalFs MISSING
-QMacStyle MISSING
-QMenuBar MISSING
-QMessageBox MISSING
-QMotif MISSING
-QMotifDialog MISSING
-QMotifPlusStyle MISSING
-QMotifStyle MISSING
-QMotifWidget MISSING
-QNPInstance MISSING
-QNPWidget MISSING
-QNetworkOperation MISSING
-QNetworkProtocol MISSING
-QObjectCleanupHandler MISSING
-QPlatinumStyle MISSING
-QProcess MISSING
-QProgressDialog MISSING
-QRegExpValidator MISSING
-QSGIStyle MISSING
-QServerSocket MISSING
-QSessionManager MISSING
-QSignal MISSING
-QSignalMapper MISSING
-QSizeGrip MISSING
-QSocket MISSING
-QSocketNotifier MISSING
-QSound MISSING
-QSplashScreen MISSING
-QSqlDatabase MISSING
-QSqlDriver MISSING
-QSqlEditorFactory MISSING
-QSqlForm MISSING
-QStatusBar MISSING
-QStoredDrag MISSING
-QStyle MISSING
-QStyleSheet MISSING
-QTabBar MISSING
-QTabDialog MISSING
-QTextDrag MISSING
-QToolBar MISSING
-QToolTipGroup MISSING
-QTranslator MISSING
-QUriDrag MISSING
-QUrlOperator MISSING
-QVButtonGroup MISSING
-QVGroupBox MISSING
-QValidator MISSING
-QWSKeyboardHandler MISSING
-QWindowsStyle MISSING
-QWindowsXPStyle MISSING
-QWorkspace MISSING
-QXtWidget MISSING
+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
diff --git a/kjsembed/tools/create_bindings.sh b/kjsembed/tools/create_bindings.sh
index 54c65965..045fcf14 100755
--- a/kjsembed/tools/create_bindings.sh
+++ b/kjsembed/tools/create_bindings.sh
@@ -10,14 +10,14 @@ function bind_class()
 
 doxygen
 
-bind_class QComboBox qcombobox
+bind_class TQComboBox qcombobox
 bind_class Qt qnamespace
 bind_class KPopupTitle kpopupmenu
 
-#bind_class QDir qdir
-#bind_class QListViewItem qlistview
+#bind_class TQDir qdir
+#bind_class TQListViewItem qlistview
 
-#bind_class QTimer qtimer
-#bind_class QBrush qbrush
-#bind_class QPen qpen
-#bind_class QPainter qpainter
+#bind_class TQTimer qtimer
+#bind_class TQBrush qbrush
+#bind_class TQPen qpen
+#bind_class TQPainter qpainter
diff --git a/kjsembed/tools/doxygen2cons_cpp.xsl b/kjsembed/tools/doxygen2cons_cpp.xsl
index e352246f..91bad62b 100644
--- a/kjsembed/tools/doxygen2cons_cpp.xsl
+++ b/kjsembed/tools/doxygen2cons_cpp.xsl
@@ -35,7 +35,7 @@ KJS::Object <xsl:value-of select="$clazz" />Cons::construct( KJS::ExecState *exe
              break;
     }
 
-    QString msg = i18n("<xsl:value-of select="$clazz" />Cons has no constructor with id '%1'").arg(id);
+    TQString msg = i18n("<xsl:value-of select="$clazz" />Cons has no constructor with id '%1'").arg(id);
     KJS::Object err = KJS::Error::create( exec, KJS::ReferenceError, msg.utf8() );
     exec->setException( err );
     return err;
@@ -51,11 +51,11 @@ KJS::Object <xsl:value-of select="$clazz" />Cons::<xsl:value-of select="$cons_na
 {
     <xsl:for-each select="param/type">
       <xsl:choose>
-        <xsl:when test=". = 'QString'">
-    QString arg<xsl:value-of select="position()-1" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="position()-1" />].toString(exec).qstring() : QString::null;
+        <xsl:when test=". = 'TQString'">
+    TQString arg<xsl:value-of select="position()-1" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="position()-1" />].toString(exec).qstring() : TQString::null;
         </xsl:when>
-        <xsl:when test=". = 'const QString &amp;'">
-    QString arg<xsl:value-of select="position()-1" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="position()-1" />].toString(exec).qstring() : QString::null;
+        <xsl:when test=". = 'const TQString &amp;'">
+    TQString arg<xsl:value-of select="position()-1" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="position()-1" />].toString(exec).qstring() : TQString::null;
         </xsl:when>
         <xsl:when test=". = 'const char *'">
     const char *arg<xsl:value-of select="position()-1" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="position()-1" />].toString(exec).ascii() : 0;
@@ -72,8 +72,8 @@ KJS::Object <xsl:value-of select="$clazz" />Cons::<xsl:value-of select="$cons_na
         <xsl:when test=". = 'bool'">
     bool arg<xsl:value-of select="position()-1" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="position()-1" />].toBoolean(exec) : false;
         </xsl:when>
-        <xsl:when test=". = 'const QStringList &amp;'">
-    QStringList arg<xsl:value-of select="position()-1" />;
+        <xsl:when test=". = 'const TQStringList &amp;'">
+    TQStringList arg<xsl:value-of select="position()-1" />;
     if ( args.size() >= <xsl:value-of select="position()" /> ) {
       // TODO: populate the list
     }
diff --git a/kjsembed/tools/doxygen2imp_cpp.xsl b/kjsembed/tools/doxygen2imp_cpp.xsl
index 4e8d73bf..c485188c 100644
--- a/kjsembed/tools/doxygen2imp_cpp.xsl
+++ b/kjsembed/tools/doxygen2imp_cpp.xsl
@@ -86,9 +86,9 @@ void <xsl:value-of select="$clazz" />Imp::addBindings( KJS::ExecState *exec, KJS
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast&lt;QComboBox *>( obj );
+           return dynamic_cast&lt;TQComboBox *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
@@ -122,7 +122,7 @@ KJS::Value <xsl:value-of select="$clazz" />Imp::call( KJS::ExecState *exec, KJS:
         break;
     }
 
-    QString msg = i18n( "<xsl:value-of select="$clazz" />Imp has no method with id '%1'" ).arg( mid );
+    TQString msg = i18n( "<xsl:value-of select="$clazz" />Imp has no method with id '%1'" ).arg( mid );
     KJS::Object err = KJS::Error::create( exec, KJS::ReferenceError, msg.utf8() );
     exec->setException( err );
     return err;
@@ -141,11 +141,11 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object
 {
     <xsl:for-each select="param/type">
       <xsl:choose>
-        <xsl:when test=". = 'QString'">
-    QString arg<xsl:value-of select="position()-1" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="position()-1" />].toString(exec).qstring() : QString::null;
+        <xsl:when test=". = 'TQString'">
+    TQString arg<xsl:value-of select="position()-1" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="position()-1" />].toString(exec).qstring() : TQString::null;
         </xsl:when>
-        <xsl:when test=". = 'const QString &amp;'">
-    QString arg<xsl:value-of select="position()-1" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="position()-1" />].toString(exec).qstring() : QString::null;
+        <xsl:when test=". = 'const TQString &amp;'">
+    TQString arg<xsl:value-of select="position()-1" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="position()-1" />].toString(exec).qstring() : TQString::null;
         </xsl:when>
         <xsl:when test=". = 'const char *'">
     const char *arg<xsl:value-of select="position()-1" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="position()-1" />].toString(exec).ascii() : 0;
@@ -162,44 +162,44 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object
         <xsl:when test=". = 'bool'">
     bool arg<xsl:value-of select="position()-1" /> = (args.size() >= <xsl:value-of select="position()" />) ? args[<xsl:value-of select="position()-1" />].toBoolean(exec) : false;
         </xsl:when>
-        <xsl:when test=". = 'const QFont &amp;'">
-    QFont arg<xsl:value-of select="position()-1" />; // TODO
+        <xsl:when test=". = 'const TQFont &amp;'">
+    TQFont arg<xsl:value-of select="position()-1" />; // TODO
         </xsl:when>
-        <xsl:when test=". = 'const QPalette &amp;'">
-    QPalette arg<xsl:value-of select="position()-1" />; // TODO
+        <xsl:when test=". = 'const TQPalette &amp;'">
+    TQPalette arg<xsl:value-of select="position()-1" />; // TODO
         </xsl:when>
-        <xsl:when test=". = 'const QStringList &amp;'">
-    QStringList arg<xsl:value-of select="position()-1" /> = extractQStringList(exec, args, <xsl:value-of select="position()-1" />);
+        <xsl:when test=". = 'const TQStringList &amp;'">
+    TQStringList arg<xsl:value-of select="position()-1" /> = extractTQStringList(exec, args, <xsl:value-of select="position()-1" />);
         </xsl:when>
-        <xsl:when test=". = 'const QStrList &amp;'">
-    QStrList arg<xsl:value-of select="position()-1" />;
+        <xsl:when test=". = 'const TQStrList &amp;'">
+    TQStrList arg<xsl:value-of select="position()-1" />;
     if ( args.size() >= <xsl:value-of select="position()" /> ) {
       // TODO: populate the list
     }
         </xsl:when>
-        <xsl:when test=". = 'const QRect &amp;'">
-    QRect arg<xsl:value-of select="position()-1" /> = extractQRect(exec, args, <xsl:value-of select="position()-1" />);
+        <xsl:when test=". = 'const TQRect &amp;'">
+    TQRect arg<xsl:value-of select="position()-1" /> = extractTQRect(exec, args, <xsl:value-of select="position()-1" />);
         </xsl:when>
-        <xsl:when test=". = 'const QSize &amp;'">
-    QSize arg<xsl:value-of select="position()-1" /> = extractQSize(exec, args, <xsl:value-of select="position()-1" />);
+        <xsl:when test=". = 'const TQSize &amp;'">
+    TQSize arg<xsl:value-of select="position()-1" /> = extractTQSize(exec, args, <xsl:value-of select="position()-1" />);
         </xsl:when>
-        <xsl:when test=". = 'const QPixmap &amp;'">
-    QPixmap arg<xsl:value-of select="position()-1" /> = extractQPixmap(exec, args, <xsl:value-of select="position()-1" />);
+        <xsl:when test=". = 'const TQPixmap &amp;'">
+    TQPixmap arg<xsl:value-of select="position()-1" /> = extractTQPixmap(exec, args, <xsl:value-of select="position()-1" />);
         </xsl:when>
-        <xsl:when test=". = 'const QColor &amp;'">
-    QColor arg<xsl:value-of select="position()-1" /> = extractQColor(exec, args, <xsl:value-of select="position()-1" />);
+        <xsl:when test=". = 'const TQColor &amp;'">
+    TQColor arg<xsl:value-of select="position()-1" /> = extractTQColor(exec, args, <xsl:value-of select="position()-1" />);
         </xsl:when>
-        <xsl:when test=". = 'const QDate &amp;'">
-    QDate arg<xsl:value-of select="position()-1" /> = extractQDate(exec, args, <xsl:value-of select="position()-1" />);
+        <xsl:when test=". = 'const TQDate &amp;'">
+    TQDate arg<xsl:value-of select="position()-1" /> = extractTQDate(exec, args, <xsl:value-of select="position()-1" />);
         </xsl:when>
-        <xsl:when test=". = 'const QTime &amp;'">
-    QTime arg<xsl:value-of select="position()-1" /> = extractQTime(exec, args, <xsl:value-of select="position()-1" />);
+        <xsl:when test=". = 'const TQTime &amp;'">
+    TQTime arg<xsl:value-of select="position()-1" /> = extractTQTime(exec, args, <xsl:value-of select="position()-1" />);
         </xsl:when>
-        <xsl:when test=". = 'const QDateTime &amp;'">
-    QDateTime arg<xsl:value-of select="position()-1" /> = extractQDateTime(exec, args, <xsl:value-of select="position()-1" />);
+        <xsl:when test=". = 'const TQDateTime &amp;'">
+    TQDateTime arg<xsl:value-of select="position()-1" /> = extractTQDateTime(exec, args, <xsl:value-of select="position()-1" />);
         </xsl:when>
         <xsl:when test=". = 'Policy'">
-    QComboBox::Policy arg<xsl:value-of select="position()-1" />; // TODO (hack for combo box)
+    TQComboBox::Policy arg<xsl:value-of select="position()-1" />; // TODO (hack for combo box)
         </xsl:when>
         <xsl:otherwise>
     // Unsupported parameter <xsl:value-of select="." />
@@ -250,8 +250,8 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object
       return KJS::Number( ret );
       </xsl:when>
 
-      <xsl:when test="$rettype = 'QString'">
-      QString ret;
+      <xsl:when test="$rettype = 'TQString'">
+      TQString ret;
       ret = instance-><xsl:value-of select="name" />( <xsl:for-each select="param">
        arg<xsl:value-of select="position()-1" /><xsl:if test="position() != count(../param)">,</xsl:if></xsl:for-each> );
       return KJS::String( ret );
@@ -264,8 +264,8 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object
       return KJS::String( ret );
       </xsl:when>
 
-      <xsl:when test="$rettype = 'QStringList'">
-      QStringList ret;
+      <xsl:when test="$rettype = 'TQStringList'">
+      TQStringList ret;
       ret = instance-><xsl:value-of select="name" />( <xsl:for-each select="param">
        arg<xsl:value-of select="position()-1" /><xsl:if test="position() != count(../param)">,</xsl:if></xsl:for-each> );
 
diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h
index 82b00044..93f17e28 100644
--- a/kjsembed/tools/headers/qbrush.h
+++ b/kjsembed/tools/headers/qbrush.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** 
 **
-** Definition of TQBrush class
+** Definition of TTQBrush class
 **
 ** Created : 940112
 **
@@ -11,7 +11,7 @@
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
+** LICENSE.TQPL included in the packaging of this file.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
@@ -27,7 +27,7 @@
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** See http://www.trolltech.com/qpl/ for TQPL licensing information.
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
@@ -35,8 +35,8 @@
 **
 **********************************************************************/
 
-#ifndef QBRUSH_H
-#define QBRUSH_H
+#ifndef TQBRUSH_H
+#define TQBRUSH_H
 
 #ifndef QT_H
 #include "tqcolor.h"
@@ -44,48 +44,48 @@
 #endif // QT_H
 
 
-class Q_EXPORT TQBrush: public Qt
+class Q_EXPORT TTQBrush: public Qt
 {
-friend class TQPainter;
+friend class TTQPainter;
 public:
-    TQBrush();
-    TQBrush( BrushStyle );
-    TQBrush( const TQColor &, BrushStyle=SolidPattern );
-    TQBrush( const TQColor &, const TQPixmap & );
-    TQBrush( const TQBrush & );
-   ~TQBrush();
-    TQBrush &operator=( const TQBrush & );
+    TTQBrush();
+    TTQBrush( BrushStyle );
+    TTQBrush( const TTQColor &, BrushStyle=SolidPattern );
+    TTQBrush( const TTQColor &, const TTQPixmap & );
+    TTQBrush( const TTQBrush & );
+   ~TTQBrush();
+    TTQBrush &operator=( const TTQBrush & );
 
     BrushStyle	style()	 const		{ return data->style; }
     void	setStyle( BrushStyle );
-    const TQColor &color()const		{ return data->color; }
-    void	setColor( const TQColor & );
-    TQPixmap    *pixmap() const		{ return data->pixmap; }
-    void	setPixmap( const TQPixmap & );
+    const TTQColor &color()const		{ return data->color; }
+    void	setColor( const TTQColor & );
+    TTQPixmap    *pixmap() const		{ return data->pixmap; }
+    void	setPixmap( const TTQPixmap & );
 
-    bool	operator==( const TQBrush &p ) const;
-    bool	operator!=( const TQBrush &b ) const
+    bool	operator==( const TTQBrush &p ) const;
+    bool	operator!=( const TTQBrush &b ) const
 					{ return !(operator==(b)); }
 
 private:
-    QBrush	copy()	const;
+    TQBrush	copy()	const;
     void	detach();
-    void	init( const TQColor &, BrushStyle );
-    struct QBrushData : public QShared {	// brush data
+    void	init( const TTQColor &, BrushStyle );
+    struct TQBrushData : public TQShared {	// brush data
 	BrushStyle style;
-	QColor	  color;
-	QPixmap	 *pixmap;
+	TQColor	  color;
+	TQPixmap	 *pixmap;
     } *data;
 };
 
 
 /*****************************************************************************
-  TQBrush stream functions
+  TTQBrush stream functions
  *****************************************************************************/
 
 #ifndef QT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & );
+Q_EXPORT TTQDataStream &operator<<( TTQDataStream &, const TTQBrush & );
+Q_EXPORT TTQDataStream &operator>>( TTQDataStream &, TTQBrush & );
 #endif
 
-#endif // QBRUSH_H
+#endif // TQBRUSH_H
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index 8eb70959..b89fd795 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 
 **
-** Definition of TQCanvas classes
+** Definition of TTQCanvas classes
 **
 ** Created : 991211
 **
@@ -11,7 +11,7 @@
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
+** LICENSE.TQPL included in the packaging of this file.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
@@ -27,7 +27,7 @@
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** See http://www.trolltech.com/qpl/ for TQPL licensing information.
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
@@ -35,8 +35,8 @@
 **
 **********************************************************************/
 
-#ifndef QCANVAS_H
-#define QCANVAS_H
+#ifndef TQCANVAS_H
+#define TQCANVAS_H
 
 #ifndef QT_H
 #include "tqscrollview.h"
@@ -49,44 +49,44 @@
 #endif // QT_H
 
 #if !defined( QT_MODULE_CANVAS ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_CANVAS )
-#define QM_EXPORT_CANVAS
-#define QM_TEMPLATE_EXTERN_CANVAS
+#define TQM_EXPORT_CANVAS
+#define TQM_TEMPLATE_EXTERN_CANVAS
 #else
-#define QM_EXPORT_CANVAS Q_EXPORT
-#define QM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN
+#define TQM_EXPORT_CANVAS Q_EXPORT
+#define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN
 #endif
 
 #ifndef QT_NO_CANVAS
 
 
-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 TTQCanvasSprite;
+class TTQCanvasPolygonalItem;
+class TTQCanvasRectangle;
+class TTQCanvasPolygon;
+class TTQCanvasEllipse;
+class TTQCanvasText;
+class TTQCanvasLine;
+class TTQCanvasChunk;
+class TTQCanvas;
+class TTQCanvasItem;
+class TTQCanvasView;
+class TTQCanvasPixmap;
 
 
-class QM_EXPORT_CANVAS TQCanvasItemList : public TQValueList<TQCanvasItem*> {
+class TQM_EXPORT_CANVAS TTQCanvasItemList : public TTQValueList<TTQCanvasItem*> {
 public:
     void sort();
-    void drawUnique( TQPainter& painter );
+    void drawUnique( TTQPainter& painter );
 };
 
 
-class TQCanvasItemExtra;
+class TTQCanvasItemExtra;
 
-class QM_EXPORT_CANVAS TQCanvasItem : public Qt
+class TQM_EXPORT_CANVAS TTQCanvasItem : public Qt
 {
 public:
-    TQCanvasItem(TQCanvas* canvas);
-    virtual ~TQCanvasItem();
+    TTQCanvasItem(TTQCanvas* canvas);
+    virtual ~TTQCanvasItem();
 
     double x() const
 	{ return myx; }
@@ -110,13 +110,13 @@ public:
     double yVelocity() const;
     virtual void advance(int stage);
 
-    virtual bool collidesWith( const TQCanvasItem* ) const=0;
+    virtual bool collidesWith( const TTQCanvasItem* ) const=0;
 
-    TQCanvasItemList collisions(bool exact /* NO DEFAULT */ ) const;
+    TTQCanvasItemList collisions(bool exact /* NO DEFAULT */ ) const;
 
-    virtual void setCanvas(TQCanvas*);
+    virtual void setCanvas(TTQCanvas*);
 
-    virtual void draw(TQPainter&)=0;
+    virtual void draw(TTQPainter&)=0;
 
     void show();
     void hide();
@@ -159,10 +159,10 @@ public:
     virtual int rtti() const;
     static int RTTI;
 
-    virtual TQRect boundingRect() const=0;
-    virtual TQRect boundingRectAdvanced() const;
+    virtual TTQRect boundingRect() const=0;
+    virtual TTQRect boundingRectAdvanced() const;
 
-    TQCanvas* canvas() const
+    TTQCanvas* canvas() const
 	{ return cnv; }
 
 protected:
@@ -171,30 +171,30 @@ protected:
 private:
     // For friendly subclasses...
 
-    friend class TQCanvasPolygonalItem;
-    friend class TQCanvasSprite;
-    friend class TQCanvasRectangle;
-    friend class TQCanvasPolygon;
-    friend class TQCanvasEllipse;
-    friend class TQCanvasText;
-    friend class TQCanvasLine;
+    friend class TTQCanvasPolygonalItem;
+    friend class TTQCanvasSprite;
+    friend class TTQCanvasRectangle;
+    friend class TTQCanvasPolygon;
+    friend class TTQCanvasEllipse;
+    friend class TTQCanvasText;
+    friend class TTQCanvasLine;
 
-    virtual TQPointArray chunks() const;
+    virtual TTQPointArray chunks() const;
     virtual void addToChunks();
     virtual void removeFromChunks();
     virtual void changeChunks();
-    virtual bool collidesWith( const TQCanvasSprite*,
-			       const TQCanvasPolygonalItem*,
-			       const TQCanvasRectangle*,
-			       const TQCanvasEllipse*,
-			       const TQCanvasText* ) const = 0;
+    virtual bool collidesWith( const TTQCanvasSprite*,
+			       const TTQCanvasPolygonalItem*,
+			       const TTQCanvasRectangle*,
+			       const TTQCanvasEllipse*,
+			       const TTQCanvasText* ) const = 0;
     // End of friend stuff
 
-    TQCanvas* cnv;
-    static TQCanvas* current_canvas;
+    TTQCanvas* cnv;
+    static TTQCanvas* current_canvas;
     double myx,myy,myz;
-    TQCanvasItemExtra *ext;
-    TQCanvasItemExtra& extra();
+    TTQCanvasItemExtra *ext;
+    TTQCanvasItemExtra& extra();
     uint ani:1;
     uint vis:1;
     uint val:1;
@@ -204,25 +204,25 @@ private:
 };
 
 
-class TQCanvasData;
+class TTQCanvasData;
 
-class QM_EXPORT_CANVAS TQCanvas : public QObject
+class TQM_EXPORT_CANVAS TTQCanvas : public TQObject
 {
     Q_OBJECT
 public:
-    TQCanvas( TQObject* parent = 0, const char* name = 0 );
-    TQCanvas(int w, int h);
-    TQCanvas( TQPixmap p, int h, int v, int tilewidth, int tileheight );
+    TTQCanvas( TTQObject* parent = 0, const char* name = 0 );
+    TTQCanvas(int w, int h);
+    TTQCanvas( TTQPixmap p, int h, int v, int tilewidth, int tileheight );
 
-    virtual ~TQCanvas();
+    virtual ~TTQCanvas();
 
-    virtual void setTiles( TQPixmap tiles, int h, int v,
+    virtual void setTiles( TTQPixmap tiles, int h, int v,
 			   int tilewidth, int tileheight );
-    virtual void setBackgroundPixmap( const TQPixmap& p );
-    TQPixmap backgroundPixmap() const;
+    virtual void setBackgroundPixmap( const TTQPixmap& p );
+    TTQPixmap backgroundPixmap() const;
 
-    virtual void setBackgroundColor( const TQColor& c );
-    TQColor backgroundColor() const;
+    virtual void setBackgroundColor( const TTQColor& c );
+    TTQColor 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; }
-    TQSize size() const
-	{ return TQSize(awidth,aheight); }
-    TQRect rect() const
-	{ return TQRect( 0, 0, awidth, aheight ); }
+    TTQSize size() const
+	{ return TTQSize(awidth,aheight); }
+    TTQRect rect() const
+	{ return TTQRect( 0, 0, awidth, aheight ); }
     bool onCanvas( int x, int y ) const
 	{ return x>=0 && y>=0 && x<awidth && y<aheight; }
-    bool onCanvas( const TQPoint& p ) const
+    bool onCanvas( const TTQPoint& p ) const
 	{ return onCanvas(p.x(),p.y()); }
     bool validChunk( int x, int y ) const
 	{ return x>=0 && y>=0 && x<chwidth && y<chheight; }
-    bool validChunk( const TQPoint& p ) const
+    bool validChunk( const TTQPoint& p ) const
 	{ return validChunk(p.x(),p.y()); }
 
     int chunkSize() const
@@ -265,34 +265,34 @@ public:
     virtual void setChangedChunk(int i, int j);
     virtual void setChangedChunkContaining(int x, int y);
     virtual void setAllChanged();
-    virtual void setChanged(const TQRect& area);
-    virtual void setUnchanged(const TQRect& area);
+    virtual void setChanged(const TTQRect& area);
+    virtual void setUnchanged(const TTQRect& area);
 
     // These call setChangedChunk.
-    void addItemToChunk(TQCanvasItem*, int i, int j);
-    void removeItemFromChunk(TQCanvasItem*, int i, int j);
-    void addItemToChunkContaining(TQCanvasItem*, int x, int y);
-    void removeItemFromChunkContaining(TQCanvasItem*, int x, int y);
-
-    TQCanvasItemList allItems();
-    TQCanvasItemList collisions( const TQPoint&) const;
-    TQCanvasItemList collisions( const TQRect&) const;
-    TQCanvasItemList collisions( const TQPointArray& pa, const TQCanvasItem* item,
+    void addItemToChunk(TTQCanvasItem*, int i, int j);
+    void removeItemFromChunk(TTQCanvasItem*, int i, int j);
+    void addItemToChunkContaining(TTQCanvasItem*, int x, int y);
+    void removeItemFromChunkContaining(TTQCanvasItem*, int x, int y);
+
+    TTQCanvasItemList allItems();
+    TTQCanvasItemList collisions( const TTQPoint&) const;
+    TTQCanvasItemList collisions( const TTQRect&) const;
+    TTQCanvasItemList collisions( const TTQPointArray& pa, const TTQCanvasItem* item,
 				bool exact) const;
 
-    void drawArea(const TQRect&, TQPainter* p, bool double_buffer=FALSE);
+    void drawArea(const TTQRect&, TTQPainter* p, bool double_buffer=FALSE);
 
-    // These are for TQCanvasView to call
-    virtual void addView(TQCanvasView*);
-    virtual void removeView(TQCanvasView*);
-    void drawCanvasArea(const TQRect&, TQPainter* p=0, bool double_buffer=TRUE);
-    void drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& r, bool dbuf );
+    // These are for TTQCanvasView to call
+    virtual void addView(TTQCanvasView*);
+    virtual void removeView(TTQCanvasView*);
+    void drawCanvasArea(const TTQRect&, TTQPainter* p=0, bool double_buffer=TRUE);
+    void drawViewArea( TTQCanvasView* view, TTQPainter* p, const TTQRect& r, bool dbuf );
 
-    // These are for TQCanvasItem to call
-    virtual void addItem(TQCanvasItem*);
-    virtual void addAnimation(TQCanvasItem*);
-    virtual void removeItem(TQCanvasItem*);
-    virtual void removeAnimation(TQCanvasItem*);
+    // These are for TTQCanvasItem to call
+    virtual void addItem(TTQCanvasItem*);
+    virtual void addAnimation(TTQCanvasItem*);
+    virtual void removeItem(TTQCanvasItem*);
+    virtual void removeAnimation(TTQCanvasItem*);
 
     virtual void setAdvancePeriod(int ms);
     virtual void setUpdatePeriod(int ms);
@@ -307,77 +307,77 @@ public slots:
     virtual void update();
 
 protected:
-    virtual void drawBackground(TQPainter&, const TQRect& area);
-    virtual void drawForeground(TQPainter&, const TQRect& area);
+    virtual void drawBackground(TTQPainter&, const TTQRect& area);
+    virtual void drawForeground(TTQPainter&, const TTQRect& area);
 
 private:
     void init(int w, int h, int chunksze=16, int maxclust=100);
 
-    TQCanvasChunk& chunk(int i, int j) const;
-    TQCanvasChunk& chunkContaining(int x, int y) const;
+    TTQCanvasChunk& chunk(int i, int j) const;
+    TTQCanvasChunk& chunkContaining(int x, int y) const;
 
-    TQRect changeBounds(const TQRect& inarea);
-    void drawChanges(const TQRect& inarea);
+    TTQRect changeBounds(const TTQRect& inarea);
+    void drawChanges(const TTQRect& inarea);
 
     void ensureOffScrSize( int osw, int osh );
-    TQPixmap offscr;
+    TTQPixmap offscr;
     int awidth,aheight;
     int chunksize;
     int maxclusters;
     int chwidth,chheight;
-    TQCanvasChunk* chunks;
+    TTQCanvasChunk* chunks;
 
-    TQCanvasData* d;
+    TTQCanvasData* d;
 
-    void initTiles(TQPixmap p, int h, int v, int tilewidth, int tileheight);
+    void initTiles(TTQPixmap p, int h, int v, int tilewidth, int tileheight);
     ushort *grid;
     ushort htiles;
     ushort vtiles;
     ushort tilew;
     ushort tileh;
     bool oneone;
-    TQPixmap pm;
-    TQTimer* update_timer;
-    TQColor bgcolor;
+    TTQPixmap pm;
+    TTQTimer* update_timer;
+    TTQColor bgcolor;
     bool debug_redraw_areas;
     bool dblbuf;
 
-    friend void qt_unview(TQCanvas* c);
+    friend void qt_unview(TTQCanvas* c);
 
 #if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
-    TQCanvas( const TQCanvas & );
-    TQCanvas &operator=( const TQCanvas & );
+    TTQCanvas( const TTQCanvas & );
+    TTQCanvas &operator=( const TTQCanvas & );
 #endif
 };
 
-class TQCanvasViewData;
+class TTQCanvasViewData;
 
-class QM_EXPORT_CANVAS TQCanvasView : public QScrollView
+class TQM_EXPORT_CANVAS TTQCanvasView : public TQScrollView
 {
     Q_OBJECT
 public:
 
-    TQCanvasView(TQWidget* parent=0, const char* name=0, WFlags f=0);
-    TQCanvasView(TQCanvas* viewing, TQWidget* parent=0, const char* name=0, WFlags f=0);
-    ~TQCanvasView();
+    TTQCanvasView(TTQWidget* parent=0, const char* name=0, WFlags f=0);
+    TTQCanvasView(TTQCanvas* viewing, TTQWidget* parent=0, const char* name=0, WFlags f=0);
+    ~TTQCanvasView();
 
-    TQCanvas* canvas() const
+    TTQCanvas* canvas() const
 	{ return viewing; }
-    void setCanvas(TQCanvas* v);
+    void setCanvas(TTQCanvas* v);
 
-    const TQWMatrix &worldMatrix() const;
-    const TQWMatrix &inverseWorldMatrix() const;
-    bool setWorldMatrix( const TQWMatrix & );
+    const TTQWMatrix &worldMatrix() const;
+    const TTQWMatrix &inverseWorldMatrix() const;
+    bool setWorldMatrix( const TTQWMatrix & );
 
 protected:
-    void drawContents( TQPainter*, int cx, int cy, int cw, int ch );
-    TQSize sizeHint() const;
+    void drawContents( TTQPainter*, int cx, int cy, int cw, int ch );
+    TTQSize sizeHint() const;
 
 private:
-    void drawContents( TQPainter* );
-    TQCanvas* viewing;
-    TQCanvasViewData* d;
-    friend void qt_unview(TQCanvas* c);
+    void drawContents( TTQPainter* );
+    TTQCanvas* viewing;
+    TTQCanvasViewData* d;
+    friend void qt_unview(TTQCanvas* c);
 
 private slots:
     void cMoving(int,int);
@@ -385,21 +385,21 @@ private slots:
 
 private:
 #if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
-    TQCanvasView( const TQCanvasView & );
-    TQCanvasView &operator=( const TQCanvasView & );
+    TTQCanvasView( const TTQCanvasView & );
+    TTQCanvasView &operator=( const TTQCanvasView & );
 #endif
 };
 
 
-class QM_EXPORT_CANVAS TQCanvasPixmap : public QPixmap
+class TQM_EXPORT_CANVAS TTQCanvasPixmap : public TQPixmap
 {
 public:
 #ifndef QT_NO_IMAGEIO
-    TQCanvasPixmap(const TQString& datafilename);
+    TTQCanvasPixmap(const TTQString& datafilename);
 #endif
-    TQCanvasPixmap(const TQImage& image);
-    TQCanvasPixmap(const TQPixmap&, const TQPoint& hotspot);
-    ~TQCanvasPixmap();
+    TTQCanvasPixmap(const TTQImage& image);
+    TTQCanvasPixmap(const TTQPixmap&, const TTQPoint& hotspot);
+    ~TTQCanvasPixmap();
 
     int offsetX() const
 	{ return hotx; }
@@ -409,73 +409,73 @@ public:
 
 private:
 #if defined(Q_DISABLE_COPY)
-    TQCanvasPixmap( const TQCanvasPixmap & );
-    TQCanvasPixmap &operator=( const TQCanvasPixmap & );
+    TTQCanvasPixmap( const TTQCanvasPixmap & );
+    TTQCanvasPixmap &operator=( const TTQCanvasPixmap & );
 #endif
-    void init(const TQImage&);
-    void init(const TQPixmap& pixmap, int hx, int hy);
+    void init(const TTQImage&);
+    void init(const TTQPixmap& pixmap, int hx, int hy);
 
-    friend class TQCanvasSprite;
-    friend class TQCanvasPixmapArray;
-    friend bool qt_testCollision(const TQCanvasSprite* s1, const TQCanvasSprite* s2);
+    friend class TTQCanvasSprite;
+    friend class TTQCanvasPixmapArray;
+    friend bool qt_testCollision(const TTQCanvasSprite* s1, const TTQCanvasSprite* s2);
 
     int hotx,hoty;
 
-    TQImage* collision_mask;
+    TTQImage* collision_mask;
 };
 
 
-class QM_EXPORT_CANVAS QCanvasPixmapArray
+class TQM_EXPORT_CANVAS TQCanvasPixmapArray
 {
 public:
-    TQCanvasPixmapArray();
+    TTQCanvasPixmapArray();
 #ifndef QT_NO_IMAGEIO
-    TQCanvasPixmapArray(const TQString& datafilenamepattern, int framecount=0);
+    TTQCanvasPixmapArray(const TTQString& datafilenamepattern, int framecount=0);
 #endif
     // this form is deprecated
-    TQCanvasPixmapArray(TQPtrList<TQPixmap>, TQPtrList<TQPoint> hotspots);
+    TTQCanvasPixmapArray(TTQPtrList<TTQPixmap>, TTQPtrList<TTQPoint> hotspots);
 
-    TQCanvasPixmapArray(TQValueList<TQPixmap>, TQPointArray hotspots = TQPointArray() );
-    ~TQCanvasPixmapArray();
+    TTQCanvasPixmapArray(TTQValueList<TTQPixmap>, TTQPointArray hotspots = TTQPointArray() );
+    ~TTQCanvasPixmapArray();
 
 #ifndef QT_NO_IMAGEIO
-    bool readPixmaps(const TQString& datafilenamepattern, int framecount=0);
-    bool readCollisionMasks(const TQString& filenamepattern);
+    bool readPixmaps(const TTQString& datafilenamepattern, int framecount=0);
+    bool readCollisionMasks(const TTQString& filenamepattern);
 #endif
 
     // deprecated
     bool operator!(); // Failure check.
     bool isValid() const;
 
-    TQCanvasPixmap* image(int i) const
+    TTQCanvasPixmap* image(int i) const
 	{ return img ? img[i] : 0; }
-    void setImage(int i, TQCanvasPixmap* p);
+    void setImage(int i, TTQCanvasPixmap* p);
     uint count() const
 	{ return (uint)framecount; }
 
 private:
 #if defined(Q_DISABLE_COPY)
-    TQCanvasPixmapArray( const TQCanvasPixmapArray & );
-    TQCanvasPixmapArray &operator=( const TQCanvasPixmapArray & );
+    TTQCanvasPixmapArray( const TTQCanvasPixmapArray & );
+    TTQCanvasPixmapArray &operator=( const TTQCanvasPixmapArray & );
 #endif
 #ifndef QT_NO_IMAGEIO
-    bool readPixmaps(const TQString& datafilenamepattern, int framecount, bool maskonly);
+    bool readPixmaps(const TTQString& datafilenamepattern, int framecount, bool maskonly);
 #endif
 
     void reset();
     int framecount;
-    TQCanvasPixmap** img;
+    TTQCanvasPixmap** img;
 };
 
 
-class QM_EXPORT_CANVAS TQCanvasSprite : public QCanvasItem
+class TQM_EXPORT_CANVAS TTQCanvasSprite : public TQCanvasItem
 {
 public:
-    TQCanvasSprite(TQCanvasPixmapArray* array, TQCanvas* canvas);
+    TTQCanvasSprite(TTQCanvasPixmapArray* array, TTQCanvas* canvas);
 
-    void setSequence(TQCanvasPixmapArray* seq);
+    void setSequence(TTQCanvasPixmapArray* seq);
 
-    virtual ~TQCanvasSprite();
+    virtual ~TTQCanvasSprite();
 
     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 TQCanvasItem* ) const;
+    bool collidesWith( const TTQCanvasItem* ) const;
 
-    TQRect boundingRect() const;
+    TTQRect 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;
-    TQCanvasPixmap* image() const
+    TTQCanvasPixmap* image() const
 	{ return images->image(frm); }
-    virtual TQCanvasPixmap* imageAdvanced() const;
-    TQCanvasPixmap* image(int f) const
+    virtual TTQCanvasPixmap* imageAdvanced() const;
+    TTQCanvasPixmap* image(int f) const
 	{ return images->image(f); }
     virtual void advance(int stage);
 
 public:
-    void draw(TQPainter& painter);
+    void draw(TTQPainter& painter);
 
 private:
 #if defined(Q_DISABLE_COPY)
-    TQCanvasSprite( const TQCanvasSprite & );
-    TQCanvasSprite &operator=( const TQCanvasSprite & );
+    TTQCanvasSprite( const TTQCanvasSprite & );
+    TTQCanvasSprite &operator=( const TTQCanvasSprite & );
 #endif
     void addToChunks();
     void removeFromChunks();
@@ -532,46 +532,46 @@ private:
     ushort anim_val;
     uint anim_state:2;
     uint anim_type:14;
-    bool collidesWith( const TQCanvasSprite*,
-		       const TQCanvasPolygonalItem*,
-		       const TQCanvasRectangle*,
-		       const TQCanvasEllipse*,
-		       const TQCanvasText* ) const;
+    bool collidesWith( const TTQCanvasSprite*,
+		       const TTQCanvasPolygonalItem*,
+		       const TTQCanvasRectangle*,
+		       const TTQCanvasEllipse*,
+		       const TTQCanvasText* ) const;
 
-    friend bool qt_testCollision( const TQCanvasSprite* s1,
-				  const TQCanvasSprite* s2 );
+    friend bool qt_testCollision( const TTQCanvasSprite* s1,
+				  const TTQCanvasSprite* s2 );
 
-    TQCanvasPixmapArray* images;
+    TTQCanvasPixmapArray* images;
 };
 
-class TQPolygonalProcessor;
+class TTQPolygonalProcessor;
 
-class QM_EXPORT_CANVAS TQCanvasPolygonalItem : public QCanvasItem
+class TQM_EXPORT_CANVAS TTQCanvasPolygonalItem : public TQCanvasItem
 {
 public:
-    TQCanvasPolygonalItem(TQCanvas* canvas);
-    virtual ~TQCanvasPolygonalItem();
+    TTQCanvasPolygonalItem(TTQCanvas* canvas);
+    virtual ~TTQCanvasPolygonalItem();
 
-    bool collidesWith( const TQCanvasItem* ) const;
+    bool collidesWith( const TTQCanvasItem* ) const;
 
-    virtual void setPen(TQPen p);
-    virtual void setBrush(TQBrush b);
+    virtual void setPen(TTQPen p);
+    virtual void setBrush(TTQBrush b);
 
-    TQPen pen() const
+    TTQPen pen() const
 	{ return pn; }
-    TQBrush brush() const
+    TTQBrush brush() const
 	{ return br; }
 
-    virtual TQPointArray areaPoints() const=0;
-    virtual TQPointArray areaPointsAdvanced() const;
-    TQRect boundingRect() const;
+    virtual TTQPointArray areaPoints() const=0;
+    virtual TTQPointArray areaPointsAdvanced() const;
+    TTQRect boundingRect() const;
 
     int rtti() const;
     static int RTTI;
 
 protected:
-    void draw(TQPainter &);
-    virtual void drawShape(TQPainter &) = 0;
+    void draw(TTQPainter &);
+    virtual void drawShape(TTQPainter &) = 0;
 
     bool winding() const;
     void setWinding(bool);
@@ -581,88 +581,88 @@ protected:
 	{ return (bool)val; }
 
 private:
-    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;
+    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;
     uint wind:1;
 };
 
 
-class QM_EXPORT_CANVAS TQCanvasRectangle : public QCanvasPolygonalItem
+class TQM_EXPORT_CANVAS TTQCanvasRectangle : public TQCanvasPolygonalItem
 {
 public:
-    TQCanvasRectangle(TQCanvas* canvas);
-    TQCanvasRectangle(const TQRect&, TQCanvas* canvas);
-    TQCanvasRectangle(int x, int y, int width, int height, TQCanvas* canvas);
+    TTQCanvasRectangle(TTQCanvas* canvas);
+    TTQCanvasRectangle(const TTQRect&, TTQCanvas* canvas);
+    TTQCanvasRectangle(int x, int y, int width, int height, TTQCanvas* canvas);
 
-    ~TQCanvasRectangle();
+    ~TTQCanvasRectangle();
 
     int width() const;
     int height() const;
     void setSize(int w, int h);
-    TQSize size() const
-	{ return TQSize(w,h); }
-    TQPointArray areaPoints() const;
-    TQRect rect() const
-	{ return TQRect(int(x()),int(y()),w,h); }
+    TTQSize size() const
+	{ return TTQSize(w,h); }
+    TTQPointArray areaPoints() const;
+    TTQRect rect() const
+	{ return TTQRect(int(x()),int(y()),w,h); }
 
-    bool collidesWith( const TQCanvasItem* ) const;
+    bool collidesWith( const TTQCanvasItem* ) const;
 
     int rtti() const;
     static int RTTI;
 
 protected:
-    void drawShape(TQPainter &);
-    TQPointArray chunks() const;
+    void drawShape(TTQPainter &);
+    TTQPointArray chunks() const;
 
 private:
-    bool collidesWith(   const TQCanvasSprite*,
-			 const TQCanvasPolygonalItem*,
-			 const TQCanvasRectangle*,
-			 const TQCanvasEllipse*,
-			 const TQCanvasText* ) const;
+    bool collidesWith(   const TTQCanvasSprite*,
+			 const TTQCanvasPolygonalItem*,
+			 const TTQCanvasRectangle*,
+			 const TTQCanvasEllipse*,
+			 const TTQCanvasText* ) const;
 
     int w, h;
 };
 
 
-class QM_EXPORT_CANVAS TQCanvasPolygon : public QCanvasPolygonalItem
+class TQM_EXPORT_CANVAS TTQCanvasPolygon : public TQCanvasPolygonalItem
 {
 public:
-    TQCanvasPolygon(TQCanvas* canvas);
-    ~TQCanvasPolygon();
-    void setPoints(TQPointArray);
-    TQPointArray points() const;
+    TTQCanvasPolygon(TTQCanvas* canvas);
+    ~TTQCanvasPolygon();
+    void setPoints(TTQPointArray);
+    TTQPointArray points() const;
     void moveBy(double dx, double dy);
 
-    TQPointArray areaPoints() const;
+    TTQPointArray areaPoints() const;
 
     int rtti() const;
     static int RTTI;
 
 protected:
-    void drawShape(TQPainter &);
-    TQPointArray poly;
+    void drawShape(TTQPainter &);
+    TTQPointArray poly;
 };
 
 
-class QM_EXPORT_CANVAS TQCanvasSpline : public QCanvasPolygon
+class TQM_EXPORT_CANVAS TTQCanvasSpline : public TQCanvasPolygon
 {
 public:
-    TQCanvasSpline(TQCanvas* canvas);
-    ~TQCanvasSpline();
+    TTQCanvasSpline(TTQCanvas* canvas);
+    ~TTQCanvasSpline();
 
-    void setControlPoints(TQPointArray, bool closed=TRUE);
-    TQPointArray controlPoints() const;
+    void setControlPoints(TTQPointArray, bool closed=TRUE);
+    TTQPointArray controlPoints() const;
     bool closed() const;
 
     int rtti() const;
@@ -670,47 +670,47 @@ public:
 
 private:
     void recalcPoly();
-    TQPointArray bez;
+    TTQPointArray bez;
     bool cl;
 };
 
 
-class QM_EXPORT_CANVAS TQCanvasLine : public QCanvasPolygonalItem
+class TQM_EXPORT_CANVAS TTQCanvasLine : public TQCanvasPolygonalItem
 {
 public:
-    TQCanvasLine(TQCanvas* canvas);
-    ~TQCanvasLine();
+    TTQCanvasLine(TTQCanvas* canvas);
+    ~TTQCanvasLine();
     void setPoints(int x1, int y1, int x2, int y2);
 
-    TQPoint startPoint() const
-	{ return TQPoint(x1,y1); }
-    TQPoint endPoint() const
-	{ return TQPoint(x2,y2); }
+    TTQPoint startPoint() const
+	{ return TTQPoint(x1,y1); }
+    TTQPoint endPoint() const
+	{ return TTQPoint(x2,y2); }
 
     int rtti() const;
     static int RTTI;
 
-    void setPen(TQPen p);
+    void setPen(TTQPen p);
 
 protected:
-    void drawShape(TQPainter &);
-    TQPointArray areaPoints() const;
+    void drawShape(TTQPainter &);
+    TTQPointArray areaPoints() const;
 
 private:
     int x1,y1,x2,y2;
 };
 
 
-class QM_EXPORT_CANVAS TQCanvasEllipse : public QCanvasPolygonalItem
+class TQM_EXPORT_CANVAS TTQCanvasEllipse : public TQCanvasPolygonalItem
 {
 
 public:
-    TQCanvasEllipse( TQCanvas* canvas );
-    TQCanvasEllipse( int width, int height, TQCanvas* canvas );
-    TQCanvasEllipse( int width, int height, int startangle, int angle,
-		    TQCanvas* canvas );
+    TTQCanvasEllipse( TTQCanvas* canvas );
+    TTQCanvasEllipse( int width, int height, TTQCanvas* canvas );
+    TTQCanvasEllipse( int width, int height, int startangle, int angle,
+		    TTQCanvas* canvas );
 
-    ~TQCanvasEllipse();
+    ~TTQCanvasEllipse();
 
     int width() const;
     int height() const;
@@ -720,44 +720,44 @@ public:
 	{ return a1; }
     int angleLength() const
 	{ return a2; }
-    TQPointArray areaPoints() const;
+    TTQPointArray areaPoints() const;
 
-    bool collidesWith( const TQCanvasItem* ) const;
+    bool collidesWith( const TTQCanvasItem* ) const;
 
     int rtti() const;
     static int RTTI;
 
 protected:
-    void drawShape(TQPainter &);
+    void drawShape(TTQPainter &);
 
 private:
-    bool collidesWith( const TQCanvasSprite*,
-		       const TQCanvasPolygonalItem*,
-		       const TQCanvasRectangle*,
-		       const TQCanvasEllipse*,
-		       const TQCanvasText* ) const;
+    bool collidesWith( const TTQCanvasSprite*,
+		       const TTQCanvasPolygonalItem*,
+		       const TTQCanvasRectangle*,
+		       const TTQCanvasEllipse*,
+		       const TTQCanvasText* ) const;
     int w, h;
     int a1, a2;
 };
 
 
-class TQCanvasTextExtra;
+class TTQCanvasTextExtra;
 
-class QM_EXPORT_CANVAS TQCanvasText : public QCanvasItem
+class TQM_EXPORT_CANVAS TTQCanvasText : public TQCanvasItem
 {
 public:
-    TQCanvasText(TQCanvas* canvas);
-    TQCanvasText(const TQString&, TQCanvas* canvas);
-    TQCanvasText(const TQString&, TQFont, TQCanvas* canvas);
+    TTQCanvasText(TTQCanvas* canvas);
+    TTQCanvasText(const TTQString&, TTQCanvas* canvas);
+    TTQCanvasText(const TTQString&, TTQFont, TTQCanvas* canvas);
 
-    virtual ~TQCanvasText();
+    virtual ~TTQCanvasText();
 
-    void setText( const TQString& );
-    void setFont( const TQFont& );
-    void setColor( const TQColor& );
-    TQString text() const;
-    TQFont font() const;
-    TQColor color() const;
+    void setText( const TTQString& );
+    void setFont( const TTQFont& );
+    void setColor( const TTQColor& );
+    TTQString text() const;
+    TTQFont font() const;
+    TTQColor color() const;
 
     void moveBy(double dx, double dy);
 
@@ -765,42 +765,42 @@ public:
 	{ return flags; }
     void setTextFlags(int);
 
-    TQRect boundingRect() const;
+    TTQRect boundingRect() const;
 
-    bool collidesWith( const TQCanvasItem* ) const;
+    bool collidesWith( const TTQCanvasItem* ) const;
 
     int rtti() const;
     static int RTTI;
 
 protected:
-    virtual void draw(TQPainter&);
+    virtual void draw(TTQPainter&);
 
 private:
 #if defined(Q_DISABLE_COPY)
-    TQCanvasText( const TQCanvasText & );
-    TQCanvasText &operator=( const TQCanvasText & );
+    TTQCanvasText( const TTQCanvasText & );
+    TTQCanvasText &operator=( const TTQCanvasText & );
 #endif
     void addToChunks();
     void removeFromChunks();
     void changeChunks();
 
     void setRect();
-    TQRect brect;
-    TQString txt;
+    TTQRect brect;
+    TTQString txt;
     int flags;
-    TQFont fnt;
-    TQColor col;
-    TQCanvasTextExtra* extra;
-
-    bool collidesWith(   const TQCanvasSprite*,
-			 const TQCanvasPolygonalItem*,
-			 const TQCanvasRectangle*,
-			 const TQCanvasEllipse*,
-			 const TQCanvasText* ) const;
+    TTQFont fnt;
+    TTQColor col;
+    TTQCanvasTextExtra* extra;
+
+    bool collidesWith(   const TTQCanvasSprite*,
+			 const TTQCanvasPolygonalItem*,
+			 const TTQCanvasRectangle*,
+			 const TTQCanvasEllipse*,
+			 const TTQCanvasText* ) const;
 };
 
 #define Q_DEFINED_QCANVAS
 #include "tqwinexport.h"
 #endif // QT_NO_CANVAS
 
-#endif // QCANVAS_H
+#endif // TQCANVAS_H
diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h
index 200514dd..4db56e03 100644
--- a/kjsembed/tools/headers/qdir.h
+++ b/kjsembed/tools/headers/qdir.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** 
 **
-** Definition of TQDir class
+** Definition of TTQDir class
 **
 ** Created : 950427
 **
@@ -11,7 +11,7 @@
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
+** LICENSE.TQPL included in the packaging of this file.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
@@ -27,7 +27,7 @@
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** See http://www.trolltech.com/qpl/ for TQPL licensing information.
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
@@ -35,8 +35,8 @@
 **
 **********************************************************************/
 
-#ifndef QDIR_H
-#define QDIR_H
+#ifndef TQDIR_H
+#define TQDIR_H
 
 #ifndef QT_H
 #include "tqglobal.h"
@@ -46,13 +46,13 @@
 
 
 #ifndef QT_NO_DIR
-typedef TQPtrList<TQFileInfo> QFileInfoList;
-typedef TQPtrListIterator<TQFileInfo> QFileInfoListIterator;
-class TQStringList;
-template <class T> class TQDeepCopy;
+typedef TTQPtrList<TTQFileInfo> TQFileInfoList;
+typedef TTQPtrListIterator<TTQFileInfo> TQFileInfoListIterator;
+class TTQStringList;
+template <class T> class TTQDeepCopy;
 
 
-class Q_EXPORT QDir
+class Q_EXPORT TQDir
 {
 public:
     enum FilterSpec { Dirs	    = 0x001,
@@ -85,34 +85,34 @@ public:
 		      IgnoreCase    = 0x10,
 		      DefaultSort   = -1 };
 
-    TQDir();
-    TQDir( const TQString &path, const TQString &nameFilter = TQString::null,
+    TTQDir();
+    TTQDir( const TTQString &path, const TTQString &nameFilter = TTQString::null,
 	  int sortSpec = Name | IgnoreCase, int filterSpec = All );
-    TQDir( const TQDir & );
+    TTQDir( const TTQDir & );
 
-    virtual ~TQDir();
+    virtual ~TTQDir();
 
-    TQDir       &operator=( const TQDir & );
-    TQDir       &operator=( const TQString &path );
+    TTQDir       &operator=( const TTQDir & );
+    TTQDir       &operator=( const TTQString &path );
 
-    virtual void setPath( const TQString &path );
-    virtual TQString path()		const;
-    virtual TQString absPath()	const;
-    virtual TQString canonicalPath()	const;
+    virtual void setPath( const TTQString &path );
+    virtual TTQString path()		const;
+    virtual TTQString absPath()	const;
+    virtual TTQString canonicalPath()	const;
 
-    virtual TQString dirName() const;
-    virtual TQString filePath( const TQString &fileName,
+    virtual TTQString dirName() const;
+    virtual TTQString filePath( const TTQString &fileName,
 			      bool acceptAbsPath = TRUE ) const;
-    virtual TQString absFilePath( const TQString &fileName,
+    virtual TTQString absFilePath( const TTQString &fileName,
 				 bool acceptAbsPath = TRUE ) const;
 
-    static TQString convertSeparators( const TQString &pathName );
+    static TTQString convertSeparators( const TTQString &pathName );
 
-    virtual bool cd( const TQString &dirName, bool acceptAbsPath = TRUE );
+    virtual bool cd( const TTQString &dirName, bool acceptAbsPath = TRUE );
     virtual bool cdUp();
 
-    QString	nameFilter() const;
-    virtual void setNameFilter( const TQString &nameFilter );
+    TQString	nameFilter() const;
+    virtual void setNameFilter( const TTQString &nameFilter );
     FilterSpec filter() const;
     virtual void setFilter( int filterSpec );
     SortSpec sorting() const;
@@ -122,30 +122,30 @@ public:
     virtual void setMatchAllDirs( bool );
 
     uint count() const;
-    QString	operator[]( int ) const;
+    TQString	operator[]( int ) const;
 
-    virtual TQStrList encodedEntryList( int filterSpec = DefaultFilter,
+    virtual TTQStrList encodedEntryList( int filterSpec = DefaultFilter,
 				       int sortSpec   = DefaultSort  ) const;
-    virtual TQStrList encodedEntryList( const TQString &nameFilter,
+    virtual TTQStrList encodedEntryList( const TTQString &nameFilter,
 				       int filterSpec = DefaultFilter,
 				       int sortSpec   = DefaultSort   ) const;
-    virtual TQStringList entryList( int filterSpec = DefaultFilter,
+    virtual TTQStringList entryList( int filterSpec = DefaultFilter,
 				   int sortSpec   = DefaultSort  ) const;
-    virtual TQStringList entryList( const TQString &nameFilter,
+    virtual TTQStringList entryList( const TTQString &nameFilter,
 				   int filterSpec = DefaultFilter,
 				   int sortSpec   = DefaultSort   ) const;
 
-    virtual const QFileInfoList *entryInfoList( int filterSpec = DefaultFilter,
+    virtual const TQFileInfoList *entryInfoList( int filterSpec = DefaultFilter,
 						int sortSpec = DefaultSort ) const;
-    virtual const QFileInfoList *entryInfoList( const TQString &nameFilter,
+    virtual const TQFileInfoList *entryInfoList( const TTQString &nameFilter,
 						int filterSpec = DefaultFilter,
 						int sortSpec = DefaultSort ) const;
 
-    static const QFileInfoList *drives();
+    static const TQFileInfoList *drives();
 
-    virtual bool mkdir( const TQString &dirName,
+    virtual bool mkdir( const TTQString &dirName,
 			bool acceptAbsPath = TRUE ) const;
-    virtual bool rmdir( const TQString &dirName,
+    virtual bool rmdir( const TTQString &dirName,
 			bool acceptAbsPath = TRUE ) const;
 
     virtual bool isReadable() const;
@@ -155,92 +155,92 @@ public:
     virtual bool isRelative() const;
     virtual void convertToAbs();
 
-    virtual bool operator==( const TQDir & ) const;
-    virtual bool operator!=( const TQDir & ) const;
+    virtual bool operator==( const TTQDir & ) const;
+    virtual bool operator!=( const TTQDir & ) const;
 
-    virtual bool remove( const TQString &fileName,
+    virtual bool remove( const TTQString &fileName,
 			 bool acceptAbsPath = TRUE );
-    virtual bool rename( const TQString &name, const TQString &newName,
+    virtual bool rename( const TTQString &name, const TTQString &newName,
 			 bool acceptAbsPaths = TRUE  );
-    virtual bool exists( const TQString &name,
+    virtual bool exists( const TTQString &name,
 			 bool acceptAbsPath = TRUE );
 
     static char separator();
 
-    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 );
+    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 );
     void refresh() const;
 
 private:
 #ifdef Q_OS_MAC
     typedef struct FSSpec FSSpec;
-    static FSSpec *make_spec(const TQString &);
+    static FSSpec *make_spec(const TTQString &);
 #endif
     void init();
-    virtual bool readDirEntries( const TQString &nameFilter,
+    virtual bool readDirEntries( const TTQString &nameFilter,
 				 int FilterSpec, int SortSpec  );
 
-    static void slashify( TQString & );
+    static void slashify( TTQString & );
 
-    QString	dPath;
-    TQStringList   *fList;
-    QFileInfoList *fiList;
-    QString	nameFilt;
+    TQString	dPath;
+    TTQStringList   *fList;
+    TQFileInfoList *fiList;
+    TQString	nameFilt;
     FilterSpec	filtS;
     SortSpec	sortS;
     uint	dirty	: 1;
     uint	allDirs : 1;
 
     void detach();
-    friend class TQDeepCopy< TQDir >;
+    friend class TTQDeepCopy< TTQDir >;
 };
 
 
-inline TQString TQDir::path() const
+inline TTQString TTQDir::path() const
 {
     return dPath;
 }
 
-inline TQString TQDir::nameFilter() const
+inline TTQString TTQDir::nameFilter() const
 {
     return nameFilt;
 }
 
-inline TQDir::FilterSpec TQDir::filter() const
+inline TTQDir::FilterSpec TTQDir::filter() const
 {
     return filtS;
 }
 
-inline TQDir::SortSpec TQDir::sorting() const
+inline TTQDir::SortSpec TTQDir::sorting() const
 {
     return sortS;
 }
 
-inline bool TQDir::matchAllDirs() const
+inline bool TTQDir::matchAllDirs() const
 {
     return allDirs;
 }
 
-inline bool TQDir::operator!=( const TQDir &d ) const
+inline bool TTQDir::operator!=( const TTQDir &d ) const
 {
     return !(*this == d);
 }
 
 
-struct QDirSortItem {
-    TQString filename_cache;
-    TQFileInfo* item;
+struct TQDirSortItem {
+    TTQString filename_cache;
+    TTQFileInfo* item;
 };
 
 #endif // QT_NO_DIR
-#endif // QDIR_H
+#endif // TQDIR_H
diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h
index 585e7af2..e1a5c582 100644
--- a/kjsembed/tools/headers/qpen.h
+++ b/kjsembed/tools/headers/qpen.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** 
 **
-** Definition of TQPen class
+** Definition of TTQPen class
 **
 ** Created : 940112
 **
@@ -11,7 +11,7 @@
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
+** LICENSE.TQPL included in the packaging of this file.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
@@ -27,7 +27,7 @@
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** See http://www.trolltech.com/qpl/ for TQPL licensing information.
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
@@ -35,8 +35,8 @@
 **
 **********************************************************************/
 
-#ifndef QPEN_H
-#define QPEN_H
+#ifndef TQPEN_H
+#define TQPEN_H
 
 #ifndef QT_H
 #include "tqcolor.h"
@@ -44,56 +44,56 @@
 #endif // QT_H
 
 
-class Q_EXPORT TQPen: public Qt
+class Q_EXPORT TTQPen: public Qt
 {
 public:
-    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 & );
+    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 & );
 
     PenStyle	style() const		{ return data->style; }
     void	setStyle( PenStyle );
     uint	width() const		{ return data->width; }
     void	setWidth( uint );
-    const TQColor &color() const		{ return data->color; }
-    void	setColor( const TQColor & );
+    const TTQColor &color() const		{ return data->color; }
+    void	setColor( const TTQColor & );
     PenCapStyle	capStyle() const;
     void	setCapStyle( PenCapStyle );
     PenJoinStyle joinStyle() const;
     void	setJoinStyle( PenJoinStyle );
 
-    bool	operator==( const TQPen &p ) const;
-    bool	operator!=( const TQPen &p ) const
+    bool	operator==( const TTQPen &p ) const;
+    bool	operator!=( const TTQPen &p ) const
 					{ return !(operator==(p)); }
 
 private:
-    friend class TQPainter;
+    friend class TTQPainter;
 #ifdef Q_WS_WIN
-    friend class QFontEngineWin;
+    friend class TQFontEngineWin;
 #endif
 
-    QPen	copy()	const;
+    TQPen	copy()	const;
     void	detach();
-    void	init( const TQColor &, uint, uint );
-    struct QPenData : public QShared {		// pen data
+    void	init( const TTQColor &, uint, uint );
+    struct TQPenData : public TQShared {		// pen data
 	PenStyle  style;
 	uint	  width;
-	QColor	  color;
+	TQColor	  color;
 	Q_UINT16  linest;
     } *data;
 };
 
 
 /*****************************************************************************
-  TQPen stream functions
+  TTQPen stream functions
  *****************************************************************************/
 #ifndef QT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & );
+Q_EXPORT TTQDataStream &operator<<( TTQDataStream &, const TTQPen & );
+Q_EXPORT TTQDataStream &operator>>( TTQDataStream &, TTQPen & );
 #endif
 
-#endif // QPEN_H
+#endif // TQPEN_H
diff --git a/kjsembed/tools/headers/qtimer.h b/kjsembed/tools/headers/qtimer.h
index 311e5e08..e61b4124 100644
--- a/kjsembed/tools/headers/qtimer.h
+++ b/kjsembed/tools/headers/qtimer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** 
 **
-** Definition of TQTimer class
+** Definition of TTQTimer class
 **
 ** Created : 931111
 **
@@ -11,7 +11,7 @@
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
+** LICENSE.TQPL included in the packaging of this file.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
@@ -27,7 +27,7 @@
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** See http://www.trolltech.com/qpl/ for TQPL licensing information.
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
@@ -35,20 +35,20 @@
 **
 **********************************************************************/
 
-#ifndef QTIMER_H
-#define QTIMER_H
+#ifndef TQTIMER_H
+#define TQTIMER_H
 
 #ifndef QT_H
 #include "tqobject.h"
 #endif // QT_H
 
 
-class Q_EXPORT TQTimer : public QObject
+class Q_EXPORT TTQTimer : public TQObject
 {
     Q_OBJECT
 public:
-    TQTimer( TQObject *parent=0, const char *name=0 );
-   ~TQTimer();
+    TTQTimer( TTQObject *parent=0, const char *name=0 );
+   ~TTQTimer();
 
     bool	isActive() const;
 
@@ -56,7 +56,7 @@ public:
     void	changeInterval( int msec );
     void	stop();
 
-    static void singleShot( int msec, TQObject *receiver, const char *member );
+    static void singleShot( int msec, TTQObject *receiver, const char *member );
 
     int		timerId() const	{ return id; }
 
@@ -64,7 +64,7 @@ signals:
     void	timeout();
 
 protected:
-    bool	event( TQEvent * );
+    bool	event( TTQEvent * );
 
 private:
     int id;
@@ -73,16 +73,16 @@ private:
 
 private:	// Disabled copy constructor and operator=
 #if defined(Q_DISABLE_COPY)
-    TQTimer( const TQTimer & );
-    TQTimer &operator=( const TQTimer & );
+    TTQTimer( const TTQTimer & );
+    TTQTimer &operator=( const TTQTimer & );
 #endif
 };
 
 
-inline bool TQTimer::isActive() const
+inline bool TTQTimer::isActive() const
 {
     return id >= 0;
 }
 
 
-#endif // QTIMER_H
+#endif // TQTIMER_H
diff --git a/kjsembed/xmlactionclient.cpp b/kjsembed/xmlactionclient.cpp
index 390d5fd2..d2394a92 100644
--- a/kjsembed/xmlactionclient.cpp
+++ b/kjsembed/xmlactionclient.cpp
@@ -31,27 +31,27 @@ namespace KJSEmbed {
 // XML Tags and Attributes
 //
 
-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" );
+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" );
 
 //
 // Default Runner
@@ -77,8 +77,8 @@ bool XMLActionRunner::run( XMLActionClient *client, const XMLActionClient::XMLAc
 // Main Client Class
 //
 
-XMLActionClient::XMLActionClient( TQObject *parent, const char *name )
-    : TQObject( parent, name ? name : "XMLActionClient" ),
+XMLActionClient::XMLActionClient( TTQObject *parent, const char *name )
+    : TTQObject( parent, name ? name : "XMLActionClient" ),
       ac(0), actrun(0)
 {
 }
@@ -87,18 +87,18 @@ XMLActionClient::~XMLActionClient()
 {
 }
 
-bool XMLActionClient::load( const TQString &filename )
+bool XMLActionClient::load( const TTQString &filename )
 {
     XMLActionHandler h( this );
     return load( &h, filename );
 }
 
-bool XMLActionClient::load( XMLActionHandler *hand, const TQString &filename )
+bool XMLActionClient::load( XMLActionHandler *hand, const TTQString &filename )
 {
-    TQFile f( filename );
-    TQXmlInputSource src( &f );
+    TTQFile f( filename );
+    TTQXmlInputSource src( &f );
 
-    TQXmlSimpleReader reader;
+    TTQXmlSimpleReader reader;
     reader.setContentHandler( hand );
     bool ok = reader.parse( src );
     if ( !ok ) {
@@ -108,7 +108,7 @@ bool XMLActionClient::load( XMLActionHandler *hand, const TQString &filename )
     return ok;
 }
 
-bool XMLActionClient::bind( const TQString &name, const XMLActionScript &s )
+bool XMLActionClient::bind( const TTQString &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 TQString &name )
+bool XMLActionClient::run( const TTQString &name )
 {
     if ( scripts.contains( name ) )
 	return run( scripts[name] );
@@ -149,7 +149,7 @@ bool XMLActionClient::run( const XMLActionScript &s )
 
 void XMLActionClient::action_activated()
 {
-    const TQObject *sender = TQObject::sender();
+    const TTQObject *sender = TTQObject::sender();
     if ( !sender )
 	return;
 
@@ -161,29 +161,29 @@ void XMLActionClient::action_activated()
 //
 
 XMLActionHandler::XMLActionHandler( XMLActionClient *client )
-    : TQXmlDefaultHandler(), actclient( client )
+    : TTQXmlDefaultHandler(), actclient( client )
 {
 }
 
-bool XMLActionHandler::characters( const TQString &chars )
+bool XMLActionHandler::characters( const TTQString &chars )
 {
     cdata = cdata + chars;
     return true;
 }
 
 
-bool XMLActionHandler::startElement( const TQString &, const TQString &, const TQString &qn,
-				     const TQXmlAttributes &attrs )
+bool XMLActionHandler::startElement( const TTQString &, const TTQString &, const TTQString &qn,
+				     const TTQXmlAttributes &attrs )
 {
-    cdata = TQString::null;
+    cdata = TTQString::null;
 
     if ( qn == tag_script ) {
 	ad.script.type = attrs.value( attr_type );
 	ad.script.src = attrs.value( attr_src );
     }
     else if ( qn == tag_group ) {
-	TQString ex = attrs.value( attr_exclusive );
-	if ( ex == TQString("true") )
+	TTQString ex = attrs.value( attr_exclusive );
+	if ( ex == TTQString("true") )
 	    ad.exclusive = true;
     }
     else if ( qn == tag_action )
@@ -192,7 +192,7 @@ bool XMLActionHandler::startElement( const TQString &, const TQString &, const T
     return true;
 }
 
-bool XMLActionHandler::endElement( const TQString &, const TQString &, const TQString &qn )
+bool XMLActionHandler::endElement( const TTQString &, const TTQString &, const TTQString &qn )
 {
     if ( qn == tag_action ) {
 	defineAction();
@@ -200,49 +200,49 @@ bool XMLActionHandler::endElement( const TQString &, const TQString &, const TQS
     }
     else if ( qn == tag_type ) {
 	ad.type = cdata;
-	cdata = TQString::null;
+	cdata = TTQString::null;
     }
     else if ( qn == tag_label ) {
 	ad.text = cdata;
-	cdata = TQString::null;
+	cdata = TTQString::null;
     }
     else if ( qn == tag_text ) {
 	// Nothing
     }
     else if ( qn == tag_icons ) {
 	ad.icons = cdata;
-	cdata = TQString::null;
+	cdata = TTQString::null;
     }
     else if ( qn == tag_shortcut ) {
 	ad.keys = cdata;
-	cdata = TQString::null;
+	cdata = TTQString::null;
     }
     else if ( qn == tag_name ) {
 	ad.name = cdata.latin1();
-	cdata = TQString::null;
+	cdata = TTQString::null;
     }
     else if ( qn == tag_group ) {
 	ad.group = cdata.latin1();
-	cdata = TQString::null;
+	cdata = TTQString::null;
     }
     else if ( qn == tag_whatsthis ) {
 	ad.whatsthis = cdata;
-	cdata = TQString::null;
+	cdata = TTQString::null;
     }
     else if ( qn == tag_statustext ) {
 	ad.status = cdata;
-	cdata = TQString::null;
+	cdata = TTQString::null;
     }
     else if ( qn == tag_script ) {
 	ad.script.text = cdata;
-	cdata = TQString::null;
+	cdata = TTQString::null;
 
 	if ( !inAction && ad.script.isValid() )
 	    actclient->run( ad.script );
     }
     else if ( qn == tag_item ) {
 	ad.items += cdata;
-	cdata = TQString::null;
+	cdata = TTQString::null;
     }
 
     return true;
@@ -263,7 +263,7 @@ void XMLActionHandler::defineAction()
 	actclient->bind( act, ad.script );
 
     ad.clear();
-    cdata = TQString::null;
+    cdata = TTQString::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 ( TQStringList::Iterator it = ad.items.begin() ; it != ad.items.end() ; ++it ) {
+	for ( TTQStringList::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 );
 
-    TQObject::connect( actclient, TQT_SIGNAL( destroyed() ), act, TQT_SLOT( deleteLater() ) );
+    TTQObject::connect( actclient, TQT_SIGNAL( destroyed() ), act, TQT_SLOT( deleteLater() ) );
 
     return act;
 }
diff --git a/kjsembed/xmlactionclient.h b/kjsembed/xmlactionclient.h
index 8b2a801b..3f78fa3f 100644
--- a/kjsembed/xmlactionclient.h
+++ b/kjsembed/xmlactionclient.h
@@ -40,7 +40,7 @@ class XMLActionScript;
  *
  * @author Richard Moore, rich@kde.org
  */
-class XMLActionClient : public QObject
+class XMLActionClient : public TQObject
 {
     Q_OBJECT
 
@@ -62,15 +62,15 @@ public:
 	 * Clears this script object. After this method has been called,
 	 * isValid() will return false.
 	 */
-	void clear() { src = type = text = TQString::null; }
+	void clear() { src = type = text = TTQString::null; }
 
-	TQString src;
-	TQString type;
-	TQString text;
+	TTQString src;
+	TTQString type;
+	TTQString text;
     };
 
     /** Creates an XMLActionClient. */
-    XMLActionClient( TQObject *parent=0, const char *name=0 );
+    XMLActionClient( TTQObject *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 TQString &filename );
+    bool load( const TTQString &filename );
 
     /** Loads actions from the named XML file. Returns true on success. */
-    bool load( XMLActionHandler *handler, const TQString &filename );
+    bool load( XMLActionHandler *handler, const TTQString &filename );
 
     /** Runs the named script. */
-    bool run( const TQString &name );
+    bool run( const TTQString &name );
 
     /** Returns the named script. */
-    XMLActionScript script( const TQString &name ) const { return scripts[name]; }
+    XMLActionScript script( const TTQString &name ) const { return scripts[name]; }
 
     /** Calls XMLActionRunner::run(). */
     bool run( const XMLActionScript &script );
 
     /** Binds a name to a script. */
-    virtual bool bind( const TQString &name, const XMLActionScript &script );
+    virtual bool bind( const TTQString &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;
-    TQMap<TQString, XMLActionScript> scripts;
+    TTQMap<TTQString, XMLActionScript> scripts;
     class XMLActionClientPrivate *d;
 };
 
@@ -172,15 +172,15 @@ public:
  *
  * @author Richard Moore, rich@kde.org
  */
-class XMLActionHandler : public QXmlDefaultHandler
+class XMLActionHandler : public TQXmlDefaultHandler
 {
 public:
     XMLActionHandler( XMLActionClient *actclient );
 
-    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 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 );
 
     /** 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 = TQString::null;
+	    text = icons = keys = name = group = whatsthis = status = TTQString::null;
 	    exclusive = false;
 	    script.clear();
 	}
 
-	TQString type;
-	TQString text;
-	TQString icons;
-	TQString keys;
-	TQString name;
-	TQString group;
+	TTQString type;
+	TTQString text;
+	TTQString icons;
+	TTQString keys;
+	TTQString name;
+	TTQString group;
 	bool exclusive;
-	TQString status;
-	TQString whatsthis;
+	TTQString status;
+	TTQString whatsthis;
 	XMLActionClient::XMLActionScript script;
-	TQStringList items;
+	TTQStringList items;
     };
 
     XMLActionData *actionData() { return &ad; }
 
 private:
     XMLActionClient *actclient;
-    TQString cdata;
+    TTQString cdata;
     bool inAction;
     XMLActionData ad;
     class XMLActionHandlerPrivate *d;
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-05 15:55:57 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-05 15:55:57 -0600
commit	9ba04742771370f59740e32e11c5f3a1e6a1b70a (patch)
tree	c81c34dae2b3b1ea73801bf18a960265dc4207f7 /kjsembed
parent	1a96c45b22d01378202d9dc7ed9c47acd30f966e (diff)
download	tdebindings-9ba04742771370f59740e32e11c5f3a1e6a1b70a.tar.gz tdebindings-9ba04742771370f59740e32e11c5f3a1e6a1b70a.zip