Fix incorrect conversion

1 files changed, 210 insertions, 210 deletions

diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp
index 62ffb456..9aa863e1 100644
--- a/kjsembed/bindings/dcop_imp.cpp
+++ b/kjsembed/bindings/dcop_imp.cpp
@@ -65,8 +65,8 @@ namespace KJSEmbed {
 namespace Bindings {
 KJS::Object JSDCOPRefLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const
 {
-    TTQString application = extractTQString(exec, args, 0);
-    TTQString object = extractTQString(exec, args, 1);
+    TQString application = extractTQString(exec, args, 0);
+    TQString object = extractTQString(exec, args, 1);
     JSOpaqueProxy * prx;
     if( application.isEmpty() )
         prx= new JSOpaqueProxy( new DCOPRef(), "DCOPRef" );
@@ -157,14 +157,14 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS::
 		kdWarning() << "Not enough args..."  << endl;
 	        return KJS::Boolean(false);
 	    }
-            TTQByteArray data, replyData;
-	    TTQDataStream ds( replyData, IO_ReadOnly);
-            TTQCString type;
+            TQByteArray data, replyData;
+	    TQDataStream ds( replyData, IO_ReadOnly);
+            TQCString type;
 
-            TTQString app = ref->app();
-            TTQString interface = ref->obj();
-            TTQString function = extractTQString(exec, args, 0);
-            TTQStringList argTypes = JSDCOPClient::getTypes( function );
+            TQString app = ref->app();
+            TQString interface = ref->obj();
+            TQString function = extractTQString(exec, args, 0);
+            TQStringList argTypes = JSDCOPClient::getTypes( function );
 
             if( args.size() > 1)
                    for( int idx = 1; idx < args.size(); ++idx)
@@ -182,12 +182,12 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS::
              if ( args.size() < 1 )
                   return KJS::Boolean(false);
 
-             TTQByteArray data;
-             TTQString app = ref->app();
-             TTQString interface = ref->obj();
-             TTQString function = extractTQString(exec, args, 0);
+             TQByteArray data;
+             TQString app = ref->app();
+             TQString interface = ref->obj();
+             TQString function = extractTQString(exec, args, 0);
 
-             TTQStringList argTypes = JSDCOPClient::getTypes( function );
+             TQStringList argTypes = JSDCOPClient::getTypes( function );
 
              if( args.size() > 1)
                 for( int idx = 1; idx < args.size(); ++idx)
@@ -215,9 +215,9 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS::
 	}
 	case MethodsetRef:
 	{
-      TTQString arg0 = extractTQString(exec, args, 0);
-      TTQString arg1 = extractTQString(exec, args, 1);
-      TTQString arg2 = extractTQString(exec, args, 0);
+      TQString arg0 = extractTQString(exec, args, 0);
+      TQString arg1 = extractTQString(exec, args, 1);
+      TQString arg2 = extractTQString(exec, args, 0);
 	    ref->setRef(arg0.latin1(), arg1.latin1(), arg2.latin1() );
             break;
 	}
@@ -304,52 +304,52 @@ KJS::Value JSDCOPClient::call( KJS::ExecState *exec, KJS::Object &self, const KJ
 	    break;
 	}
 	case MethodremoteObjects: {
-	    TTQString arg0 = extractTQString(exec, args, 0);
+	    TQString arg0 = extractTQString(exec, args, 0);
 	    retValue = convertToValue( exec, remoteObjects(arg0));
 	    break;
 	}
 	case MethodremoteInterfaces: {
-	    TTQString arg0 = extractTQString(exec, args, 0);
-	    TTQString arg1 = extractTQString(exec, args, 1);
+	    TQString arg0 = extractTQString(exec, args, 0);
+	    TQString arg1 = extractTQString(exec, args, 1);
 	    this->remoteInterfaces(arg0, arg1);
 	    break;
 	}
 	case MethodremoteFunctions: {
-	    TTQString arg0 = extractTQString(exec, args, 0);
-	    TTQString arg1 = extractTQString(exec, args, 1);
+	    TQString arg0 = extractTQString(exec, args, 0);
+	    TQString arg1 = extractTQString(exec, args, 1);
 	    remoteFunctions(arg0, arg1);
 	    break;
 	}
 	case MethodconnectDCOPSignal: {
-	    TTQString arg0 = extractTQString(exec, args, 0);
-	    TTQString arg1 = extractTQString(exec, args, 1);
-	    TTQString arg2 = extractTQString(exec, args, 2);
-	    TTQString arg3 = extractTQString(exec, args, 3);
-	    TTQString arg4 = extractTQString(exec, args, 4);
+	    TQString arg0 = extractTQString(exec, args, 0);
+	    TQString arg1 = extractTQString(exec, args, 1);
+	    TQString arg2 = extractTQString(exec, args, 2);
+	    TQString arg3 = extractTQString(exec, args, 3);
+	    TQString arg4 = extractTQString(exec, args, 4);
 	    bool arg5 = (args.size() > 5) ? args[5].toBoolean(exec) : false;
 	    connectDCOPSignal( arg0, arg1, arg2, arg3, arg4, arg5);
 	    break;
 	}
 	case MethoddisconnectDCOPSignal: {
-	    TTQString arg0 = extractTQString(exec, args, 0);
-	    TTQString arg1 = extractTQString(exec, args, 1);
-	    TTQString arg2 = extractTQString(exec, args, 2);
-	    TTQString arg3 = extractTQString(exec, args, 3);
-	    TTQString arg4 = extractTQString(exec, args, 4);
+	    TQString arg0 = extractTQString(exec, args, 0);
+	    TQString arg1 = extractTQString(exec, args, 1);
+	    TQString arg2 = extractTQString(exec, args, 2);
+	    TQString arg3 = extractTQString(exec, args, 3);
+	    TQString arg4 = extractTQString(exec, args, 4);
 	    disconnectDCOPSignal(arg0, arg1, arg2, arg3, arg4);
 	    break;
 	}
 	case MethodDCOPStart: {
-		TTQString arg0 = extractTQString(exec, args, 0);
+		TQString arg0 = extractTQString(exec, args, 0);
 
-		retValue = KJS::String( dcopStart( arg0, TTQStringList() ) );
+		retValue = KJS::String( dcopStart( arg0, TQStringList() ) );
 		break;
 	}
 	case MethodappId:
 		retValue = KJS::String( kapp->dcopClient()->appId().data() );
 		break;
 	case MethodisApplicationRegistered: {
-		TTQString arg0 = extractTQString(exec, args, 0);
+		TQString arg0 = extractTQString(exec, args, 0);
 		retValue = KJS::Boolean( kapp->dcopClient()->isApplicationRegistered( arg0.latin1() )  );
 		break;
 	}
@@ -387,20 +387,20 @@ KJS::Value JSDCOPClient::dcopCall( KJS::ExecState * exec, KJS::Object &, const K
 	if ( args.size() < 3 )
 		return KJS::Boolean(false);
 
-	TTQStringList types;
-	TTQByteArray data, replyData;
-	TTQDataStream ds( replyData, IO_ReadOnly);
-	TTQCString type;
+	TQStringList types;
+	TQByteArray data, replyData;
+	TQDataStream ds( replyData, IO_ReadOnly);
+	TQCString type;
 
-	TTQString app = extractTQString(exec, args, 0);
-	TTQString interface = extractTQString(exec, args, 1);
-	TTQString function = extractTQString(exec, args, 2);
-	TTQStringList argTypes = getTypes( function );
+	TQString app = extractTQString(exec, args, 0);
+	TQString interface = extractTQString(exec, args, 1);
+	TQString function = extractTQString(exec, args, 2);
+	TQStringList argTypes = getTypes( function );
 
 	if( args.size() > 3)
 		for( int idx = 3; idx < args.size(); ++idx)
 		{
-			TTQVariant var = convertToVariant(exec,args[idx] );
+			TQVariant var = convertToVariant(exec,args[idx] );
 			marshall(var, argTypes[idx -3 ], data);
 		}
 	if( !kapp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData))
@@ -414,23 +414,23 @@ KJS::Value JSDCOPClient::dcopSend( KJS::ExecState * exec, KJS::Object &, const K
 	if ( args.size() < 3 )
 		return KJS::Boolean(false);
 
-	TTQByteArray data;
-	TTQString app = extractTQString(exec, args, 0);
-	TTQString interface = extractTQString(exec, args, 1);
-	TTQString function = extractTQString(exec, args, 2);
-	TTQStringList argTypes = getTypes( function );
+	TQByteArray data;
+	TQString app = extractTQString(exec, args, 0);
+	TQString interface = extractTQString(exec, args, 1);
+	TQString function = extractTQString(exec, args, 2);
+	TQStringList argTypes = getTypes( function );
 
 	if( args.size() > 3)
 		for( int idx = 3; idx < args.size(); ++idx)
 		{
-			TTQVariant var = convertToVariant(exec,args[idx] );
+			TQVariant var = convertToVariant(exec,args[idx] );
 			marshall(var, argTypes[idx - 3], data);
 		}
 	return KJS::Boolean( kapp->dcopClient()->send(app.local8Bit(), interface.local8Bit(),
                         function.local8Bit(), data));
 }
 
-KJS::Value JSDCOPClient::demarshall( KJS::ExecState * exec, const TTQCString& type, TTQDataStream& data)
+KJS::Value JSDCOPClient::demarshall( KJS::ExecState * exec, const TQCString& type, TQDataStream& data)
 {
 	kdDebug() << "Demarshall " << type << endl;
 
@@ -449,23 +449,23 @@ KJS::Value JSDCOPClient::demarshall( KJS::ExecState * exec, const TTQCString& ty
 		return convertToValue(exec, demarshall(type, data));
 }
 
-TTQStringList JSDCOPClient::getTypes( const TTQString& function )
+TQStringList JSDCOPClient::getTypes( const TQString& function )
 {
-	TTQCString myFunction = DCOPClient::normalizeFunctionSignature (function.latin1());
-	TTQString args = myFunction.mid( myFunction.find('(') + 1 );
+	TQCString myFunction = DCOPClient::normalizeFunctionSignature (function.latin1());
+	TQString args = myFunction.mid( myFunction.find('(') + 1 );
 	args = args.left( args.length() - 1);
-	return TTQStringList::split(',', args);
+	return TQStringList::split(',', args);
 }
 
-void JSDCOPClient::marshall( const TTQVariant& data, const TTQString& typeName, TTQByteArray& buffer )
+void JSDCOPClient::marshall( const TQVariant& data, const TQString& typeName, TQByteArray& buffer )
 {
-	TTQDataStream stream(buffer, IO_WriteOnly | IO_Append);
+	TQDataStream stream(buffer, IO_WriteOnly | IO_Append);
 
-	if ( typeName == "TTQString" )
+	if ( typeName == "TQString" )
 	{
 		stream << data.toString();
 	}
-	else if ( typeName == "TTQCString")
+	else if ( typeName == "TQCString")
 	{
 		stream << data.toCString();
 	}
@@ -485,99 +485,99 @@ void JSDCOPClient::marshall( const TTQVariant& data, const TTQString& typeName,
 	{
 		stream << data.toDouble();
 	}
-	else if ( typeName == "TTQMap" )
+	else if ( typeName == "TQMap" )
 	{
 		stream << data.toMap();
 	}
-	else if ( typeName == "TTQValueList")
+	else if ( typeName == "TQValueList")
 	{
 		stream << data.toList();
 	}
-	else if ( typeName == "TTQFont")
+	else if ( typeName == "TQFont")
 	{
 		stream << data.toFont();
 	}
-	else if ( typeName == "TTQPixmap")
+	else if ( typeName == "TQPixmap")
 	{
 		stream << data.toPixmap();
 	}
-	else if ( typeName == "TTQBrush")
+	else if ( typeName == "TQBrush")
 	{
 		stream << data.toBrush();
 	}
-	else if ( typeName == "TTQRect")
+	else if ( typeName == "TQRect")
 	{
 		stream << data.toRect();
 	}
-	else if ( typeName == "TTQSize")
+	else if ( typeName == "TQSize")
 	{
 		stream << data.toSize();
 	}
-	else if ( typeName == "TTQColor")
+	else if ( typeName == "TQColor")
 	{
 		stream << data.toColor();
 	}
-	else if ( typeName == "TTQPalette")
+	else if ( typeName == "TQPalette")
 	{
 		stream << data.toPalette();
 	}
-	else if ( typeName == "TTQColorGroup")
+	else if ( typeName == "TQColorGroup")
 	{
 		stream << data.toColorGroup();
 	}
-	/*else if ( typeName == "TTQIconSet")
+	/*else if ( typeName == "TQIconSet")
 	{
 		stream << data.toIconSet();
 	}*/
-	else if ( typeName == "TTQPoint")
+	else if ( typeName == "TQPoint")
 	{
 		stream << data.toPoint();
 	}
-	else if ( typeName == "TTQImage")
+	else if ( typeName == "TQImage")
 	{
 		stream << data.toImage();
 	}
-	else if ( typeName == "TTQPointArray")
+	else if ( typeName == "TQPointArray")
 	{
 		stream << data.toPointArray();
 	}
-	else if ( typeName == "TTQRegion")
+	else if ( typeName == "TQRegion")
 	{
 		stream << data.toRegion();
 	}
-	else if ( typeName == "TTQBitmap")
+	else if ( typeName == "TQBitmap")
 	{
 		stream << data.toBitmap();
 	}
-	else if ( typeName == "TTQCursor")
+	else if ( typeName == "TQCursor")
 	{
 		stream << data.toCursor();
 	}
-	/*else if ( typeName == "TTQSizePolicy")
+	/*else if ( typeName == "TQSizePolicy")
 	{
 		stream << data.toSizePolicy();
 	}*/
-	else if ( typeName == "TTQDate")
+	else if ( typeName == "TQDate")
 	{
 		stream << data.toDate();
 	}
-	else if ( typeName == "TTQTime")
+	else if ( typeName == "TQTime")
 	{
 		stream << data.toTime();
 	}
-	else if ( typeName == "TTQDateTime")
+	else if ( typeName == "TQDateTime")
 	{
 		stream << data.toDateTime();
 	}
-	else if ( typeName == "TTQByteArray")
+	else if ( typeName == "TQByteArray")
 	{
 		stream << data.toByteArray();
 	}
-	else if ( typeName == "TTQBitArray")
+	else if ( typeName == "TQBitArray")
 	{
 		stream << data.toBitArray();
 	}
-	else if ( typeName == "TTQKeySequence")
+	else if ( typeName == "TQKeySequence")
 	{
 		stream << data.toKeySequence();
 	}
@@ -591,18 +591,18 @@ void JSDCOPClient::marshall( const TTQVariant& data, const TTQString& typeName,
 
 }
 
-TTQString JSDCOPClient::dcopStart( const TTQString &appName, const TTQStringList& args )
+TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& args )
 {
-	TTQString error;
-	TTQString startFunction;
+	TQString error;
+	TQString startFunction;
 	if (appName.endsWith(".desktop"))
-		startFunction = "start_service_by_desktop_path(TTQString,TTQStringList)";
+		startFunction = "start_service_by_desktop_path(TQString,TQStringList)";
 	else
-		startFunction = "start_service_by_desktop_name(TTQString,TTQStringList)";
+		startFunction = "start_service_by_desktop_name(TQString,TQStringList)";
 
-	TTQByteArray data, replyData;
-	TTQCString replyType;
-	TTQDataStream arg(data, IO_WriteOnly);
+	TQByteArray data, replyData;
+	TQCString replyType;
+	TQDataStream arg(data, IO_WriteOnly);
 	arg << appName << args;
 
 	if ( !kapp->dcopClient()->call( "klauncher", "klauncher", startFunction.latin1(),  data, replyType, replyData) )
@@ -611,7 +611,7 @@ TTQString JSDCOPClient::dcopStart( const TTQString &appName, const TTQStringList
 	}
 	else
 	{
-		TTQDataStream reply(replyData, IO_ReadOnly);
+		TQDataStream reply(replyData, IO_ReadOnly);
 
 		if ( replyType != "serviceResult" )
 		{
@@ -620,8 +620,8 @@ TTQString JSDCOPClient::dcopStart( const TTQString &appName, const TTQStringList
 		else
 		{
 			int result;
-			TTQCString dcopName;
-			TTQString error;
+			TQCString dcopName;
+			TQString error;
 			reply >> result >> dcopName >> error;
 			if (result != 0)
 			{
@@ -640,57 +640,57 @@ TTQString JSDCOPClient::dcopStart( const TTQString &appName, const TTQStringList
 
 }
 
-TTQStringList JSDCOPClient::remoteFunctions( const TTQString & remApp, const TTQString & remObj )
+TQStringList JSDCOPClient::remoteFunctions( const TQString & remApp, const TQString & remObj )
 {
-	TTQStringList returnList;
+	TQStringList returnList;
 	TQCStringList lst = kapp->dcopClient()->remoteFunctions(remApp.local8Bit(), remObj.local8Bit());
 	for(uint idx = 0; idx < lst.count(); ++idx)
 		returnList += lst[idx];
 	return returnList;
 }
 
-TTQStringList JSDCOPClient::remoteInterfaces( const TTQString & remApp, const TTQString & remObj )
+TQStringList JSDCOPClient::remoteInterfaces( const TQString & remApp, const TQString & remObj )
 {
-	TTQStringList returnList;
+	TQStringList returnList;
 	TQCStringList lst = kapp->dcopClient()->remoteInterfaces(remApp.local8Bit(), remObj.local8Bit());
 	for(uint idx = 0; idx < lst.count(); ++idx)
 		returnList += lst[idx];
 	return returnList;
 }
 
-TTQStringList JSDCOPClient::remoteObjects( const TTQString & remApp )
+TQStringList JSDCOPClient::remoteObjects( const TQString & remApp )
 {
-	TTQStringList returnList;
+	TQStringList returnList;
 	TQCStringList lst = kapp->dcopClient()->remoteObjects(remApp.local8Bit());
 	for(uint idx = 0; idx < lst.count(); ++idx)
 		returnList += lst[idx];
 	return returnList;
 }
 
-TTQStringList JSDCOPClient::registeredApplications( )
+TQStringList JSDCOPClient::registeredApplications( )
 {
-	TTQStringList returnList;
+	TQStringList returnList;
 	TQCStringList lst = kapp->dcopClient()->registeredApplications( );
 	for(uint idx = 0; idx < lst.count(); ++idx)
 		returnList += lst[idx];
 	return returnList;
 }
 
-bool JSDCOPClient::connectDCOPSignal (const TTQString &sender, const TTQString &senderObj, const TTQString &signal, const TTQString &receiverObj, const TTQString &slot, bool Volatile)
+bool JSDCOPClient::connectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot, bool Volatile)
 {
 	return kapp->dcopClient()->connectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1(), Volatile);
 }
 
-bool JSDCOPClient::disconnectDCOPSignal (const TTQString &sender, const TTQString &senderObj, const TTQString &signal, const TTQString &receiverObj, const TTQString &slot)
+bool JSDCOPClient::disconnectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot)
 {
 	return kapp->dcopClient()->disconnectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1());
 }
 
 KJS::Object JSDCOPInterfacerLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const
 {
-    TTQObject *parent = extractTQObject(exec, args, 0);
-    TTQString name = extractTQString(exec, args, 1);
-    TTQObject *obj = new JSDCOPInterface(jspart->interpreter(),parent, name.latin1() );
+    TQObject *parent = extractTQObject(exec, args, 0);
+    TQString name = extractTQString(exec, args, 1);
+    TQObject *obj = new JSDCOPInterface(jspart->interpreter(),parent, name.latin1() );
     JSObjectProxy *prxy = new JSObjectProxy(jspart, obj);
     KJS::Object object(prxy);
     addBindings(jspart,exec,object);
@@ -704,7 +704,7 @@ void JSDCOPInterfacerLoader::addBindings( KJSEmbedPart *jspart, KJS::ExecState *
         prx->addBindings( exec, proxy );
 }
 
-void JSDCOPInterface::publish( const TTQString & signature )
+void JSDCOPInterface::publish( const TQString & signature )
 {
 	if( m_Members.find(signature.latin1() ) == m_Members.end())
 		m_Members.append(signature.latin1() );
@@ -714,22 +714,22 @@ JSDCOPInterface::~ JSDCOPInterface( )
 {
 }
 
-JSDCOPInterface::JSDCOPInterface( KJS::Interpreter *js, TTQObject * parent, const char * name )
+JSDCOPInterface::JSDCOPInterface( KJS::Interpreter *js, TQObject * parent, const char * name )
 	: BindingObject( parent, name ),DCOPObject(name), m_js(js)
 {
 	m_Members.clear();
 }
 
-TTQCStringList JSDCOPInterface::functionsDynamic( )
+TQCStringList JSDCOPInterface::functionsDynamic( )
 {
 	return m_Members;
 }
 
-bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQByteArray & data, TTQCString & replyType, TTQByteArray & replyData )
+bool JSDCOPInterface::processDynamic( const TQCString & rawFunction, const TQByteArray & data, TQCString & replyType, TQByteArray & replyData )
 {
 	bool isOkay = false;
 
-	TTQRegExp reg = TTQRegExp("([_\\d\\w]+)(\\()(.*)(\\))");
+	TQRegExp reg = TQRegExp("([_\\d\\w]+)(\\()(.*)(\\))");
 	reg.search(rawFunction);
 
 	kdDebug() << "Raw function: " << rawFunction << endl;
@@ -737,9 +737,9 @@ bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQB
 	kdDebug() << "Signature: " << reg.cap(1) << endl;
 	kdDebug() << "Args: " << reg.cap(3) << endl;
 
-	TTQString signature = reg.cap(1);
+	TQString signature = reg.cap(1);
 
-	TTQStringList argStrings = TTQStringList::split(',', reg.cap(3), false);
+	TQStringList argStrings = TQStringList::split(',', reg.cap(3), false);
 	kdDebug() << argStrings.count() << " args..." << endl;
 
 	KJS::ExecState *exec = m_js->globalExec();
@@ -751,7 +751,7 @@ bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQB
 
 	if ( fun.implementsCall() )
 	{
-		TTQDataStream ds( data, IO_ReadOnly );
+		TQDataStream ds( data, IO_ReadOnly );
 		KJS::List args;
 		for( uint idx = 0; idx < argStrings.count(); ++idx)
 		{
@@ -779,7 +779,7 @@ bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQB
           if( oprx )
           {
             replyType = "DCOPRef";
-            TTQDataStream refStream( replyData, IO_WriteOnly );
+            TQDataStream refStream( replyData, IO_WriteOnly );
             if( oprx->typeName() == "DCOPRef" )
             {
                 DCOPRef ref(*oprx->toNative<DCOPRef>());
@@ -790,7 +790,7 @@ bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQB
 			}
 			else
 			{
-				TTQVariant returnVariant = convertToVariant(exec, retValue);
+				TQVariant returnVariant = convertToVariant(exec, retValue);
 				JSDCOPClient::marshall(returnVariant,returnVariant.typeName(), replyData);
 				replyType = returnVariant.typeName();
 				isOkay = true;
@@ -800,216 +800,216 @@ bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQB
 	return isOkay;
 }
 
-TTQVariant JSDCOPClient::demarshall( const TTQCString & type, TTQDataStream & reply )
+TQVariant JSDCOPClient::demarshall( const TQCString & type, TQDataStream & reply )
 {
 	kdDebug() << "Type: '" << type << "'"<< endl;
-	/*if ( type == "TTQMap" )  // ? dont handle?
+	/*if ( type == "TQMap" )  // ? dont handle?
 	{
-		TTQMap<TTQVariant, TTQVariant> result;
+		TQMap<TQVariant, TQVariant> result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQValueList") // ? dont handle?
+	else if ( type == "TQValueList") // ? dont handle?
 	{
-		TTQValueList<TTQVariant> result;
+		TQValueList<TQVariant> result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}else if ( type == "TQVariantList")
 	{
 		TQVariantList result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
 	else */
-	if ( type == "TTQString")
+	if ( type == "TQString")
 	{
-		TTQString result;
+		TQString result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
 	else if ( type == "int")
 	{
 		int result;
 		reply >> result;
 		kdDebug() << "Result: " << result << endl;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
 	else if ( type == "uint")
 	{
 		uint result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
 	else if ( type == "bool")
 	{
 		bool result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
 	else if ( type == "double")
 	{
 		double result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQCString")
+	else if ( type == "TQCString")
 	{
-		TTQCString result;
+		TQCString result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQVariant")
+	else if ( type == "TQVariant")
 	{
-		TTQVariant result;
+		TQVariant result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQFont")
+	else if ( type == "TQFont")
 	{
-		TTQFont result;
+		TQFont result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQPixmap")
+	else if ( type == "TQPixmap")
 	{
-		TTQPixmap result;
+		TQPixmap result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQBrush")
+	else if ( type == "TQBrush")
 	{
-		TTQBrush result;
+		TQBrush result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQRect")
+	else if ( type == "TQRect")
 	{
-		TTQRect result;
+		TQRect result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQSize")
+	else if ( type == "TQSize")
 	{
-		TTQSize result;
+		TQSize result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQColor")
+	else if ( type == "TQColor")
 	{
-		TTQColor result;
+		TQColor result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQPalette")
+	else if ( type == "TQPalette")
 	{
-		TTQPalette result;
+		TQPalette result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQColorGroup")
+	else if ( type == "TQColorGroup")
 	{
-		TTQColorGroup result;
+		TQColorGroup result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	/*else if ( type == "TTQIconSet")
+	/*else if ( type == "TQIconSet")
 	{
-		TTQIconSet result;
+		TQIconSet result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}*/
-	else if ( type == "TTQPoint")
+	else if ( type == "TQPoint")
 	{
-		TTQPoint result;
+		TQPoint result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQImage")
+	else if ( type == "TQImage")
 	{
-		TTQImage result;
+		TQImage result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQPointArray")
+	else if ( type == "TQPointArray")
 	{
-		TTQPointArray result;
+		TQPointArray result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQRegion")
+	else if ( type == "TQRegion")
 	{
-		TTQRegion result;
+		TQRegion result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQBitmap")
+	else if ( type == "TQBitmap")
 	{
-		TTQBitmap result;
+		TQBitmap result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQCursor")
+	else if ( type == "TQCursor")
 	{
-		TTQCursor result;
+		TQCursor result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	/*else if ( type == "TTQSizePolicy")
+	/*else if ( type == "TQSizePolicy")
 	{
-		TTQSizePolicy result;
+		TQSizePolicy result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}*/
-	else if ( type == "TTQDate")
+	else if ( type == "TQDate")
 	{
-		TTQDate result;
+		TQDate result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQTime")
+	else if ( type == "TQTime")
 	{
-		TTQTime result;
+		TQTime result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQDateTime")
+	else if ( type == "TQDateTime")
 	{
-		TTQDateTime result;
+		TQDateTime result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQByteArray")
+	else if ( type == "TQByteArray")
 	{
-		TTQByteArray result;
+		TQByteArray result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQBitArray")
+	else if ( type == "TQBitArray")
 	{
-		TTQBitArray result;
+		TQBitArray result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQKeySequence")
+	else if ( type == "TQKeySequence")
 	{
-		TTQKeySequence result;
+		TQKeySequence result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
-	else if ( type == "TTQStringList")
+	else if ( type == "TQStringList")
 	{
-		TTQStringList result;
+		TQStringList result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
 	else if ( type == "TQCStringList")
 	{
-		TTQStringList result;
+		TQStringList result;
 		reply >> result;
-		return TTQVariant(result);
+		return TQVariant(result);
 	}
 	else
-		return TTQVariant();
+		return TQVariant();
 
 }
 } // namespace Bindings