Initial TQt conversion

24 files changed, 634 insertions, 634 deletions

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