diff options
Diffstat (limited to 'kjsembed/bindings/dcop_imp.cpp')
| -rw-r--r-- | kjsembed/bindings/dcop_imp.cpp | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp index f4d68972..b30ee508 100644 --- a/kjsembed/bindings/dcop_imp.cpp +++ b/kjsembed/bindings/dcop_imp.cpp @@ -1,6 +1,4 @@ // $Id$ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * @@ -171,7 +169,7 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: { JSDCOPClient::marshall(convertToVariant(exec,args[idx] ), argTypes[idx - 1], data); } - if( !kapp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData)) + if( !tdeApp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData)) retValue = KJS::Boolean(false); else retValue = JSDCOPClient::demarshall(exec, type, ds); @@ -194,7 +192,7 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: { JSDCOPClient::marshall(convertToVariant(exec,args[idx] ), argTypes[idx - 1], data); } - retValue = KJS::Boolean( kapp->dcopClient()->send(app.local8Bit(), interface.local8Bit(), + retValue = KJS::Boolean( tdeApp->dcopClient()->send(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data)); break; } @@ -233,7 +231,7 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: KJS::Object JSDCOPClientLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &/*args*/) const { - JSOpaqueProxy * prx = new JSOpaqueProxy( kapp->dcopClient(), "DCOPClient" ); + JSOpaqueProxy * prx = new JSOpaqueProxy( tdeApp->dcopClient(), "DCOPClient" ); prx->setOwner( JSProxy::Native ); KJS::Object proxyObj( prx ); addBindings( jspart, exec, proxyObj ); @@ -346,11 +344,11 @@ KJS::Value JSDCOPClient::call( KJS::ExecState *exec, KJS::Object &self, const KJ break; } case MethodappId: - retValue = KJS::String( kapp->dcopClient()->appId().data() ); + retValue = KJS::String( tdeApp->dcopClient()->appId().data() ); break; case MethodisApplicationRegistered: { TQString arg0 = extractTQString(exec, args, 0); - retValue = KJS::Boolean( kapp->dcopClient()->isApplicationRegistered( arg0.latin1() ) ); + retValue = KJS::Boolean( tdeApp->dcopClient()->isApplicationRegistered( arg0.latin1() ) ); break; } case Methodsend: @@ -368,18 +366,18 @@ KJS::Value JSDCOPClient::call( KJS::ExecState *exec, KJS::Object &self, const KJ bool JSDCOPClient::attach() const { - if( !kapp->dcopClient()->isAttached() ) - return kapp->dcopClient()->attach(); + if( !tdeApp->dcopClient()->isAttached() ) + return tdeApp->dcopClient()->attach(); return true; } bool JSDCOPClient::detach() const -{ return kapp->dcopClient()->detach(); +{ return tdeApp->dcopClient()->detach(); } bool JSDCOPClient::isAttached() const { - return kapp->dcopClient()->isAttached(); + return tdeApp->dcopClient()->isAttached(); } KJS::Value JSDCOPClient::dcopCall( KJS::ExecState * exec, KJS::Object &, const KJS::List & args ) @@ -403,7 +401,7 @@ KJS::Value JSDCOPClient::dcopCall( KJS::ExecState * exec, KJS::Object &, const K 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)) + if( !tdeApp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData)) return KJS::Boolean(false); else return demarshall(exec, type, ds); @@ -426,7 +424,7 @@ KJS::Value JSDCOPClient::dcopSend( KJS::ExecState * exec, KJS::Object &, const K TQVariant var = convertToVariant(exec,args[idx] ); marshall(var, argTypes[idx - 3], data); } - return KJS::Boolean( kapp->dcopClient()->send(app.local8Bit(), interface.local8Bit(), + return KJS::Boolean( tdeApp->dcopClient()->send(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data)); } @@ -605,7 +603,7 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a TQDataStream arg(data, IO_WriteOnly); arg << appName << args; - if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", startFunction.latin1(), data, replyType, replyData) ) + if ( !tdeApp->dcopClient()->call( "tdelauncher", "tdelauncher", startFunction.latin1(), data, replyType, replyData) ) { kdWarning() << "Error: Dcop call failed" << endl; } @@ -643,7 +641,7 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a TQStringList JSDCOPClient::remoteFunctions( const TQString & remApp, const TQString & remObj ) { TQStringList returnList; - QCStringList lst = kapp->dcopClient()->remoteFunctions(remApp.local8Bit(), remObj.local8Bit()); + QCStringList lst = tdeApp->dcopClient()->remoteFunctions(remApp.local8Bit(), remObj.local8Bit()); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; @@ -652,7 +650,7 @@ TQStringList JSDCOPClient::remoteFunctions( const TQString & remApp, const TQStr TQStringList JSDCOPClient::remoteInterfaces( const TQString & remApp, const TQString & remObj ) { TQStringList returnList; - QCStringList lst = kapp->dcopClient()->remoteInterfaces(remApp.local8Bit(), remObj.local8Bit()); + QCStringList lst = tdeApp->dcopClient()->remoteInterfaces(remApp.local8Bit(), remObj.local8Bit()); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; @@ -661,7 +659,7 @@ TQStringList JSDCOPClient::remoteInterfaces( const TQString & remApp, const TQSt TQStringList JSDCOPClient::remoteObjects( const TQString & remApp ) { TQStringList returnList; - QCStringList lst = kapp->dcopClient()->remoteObjects(remApp.local8Bit()); + QCStringList lst = tdeApp->dcopClient()->remoteObjects(remApp.local8Bit()); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; @@ -670,7 +668,7 @@ TQStringList JSDCOPClient::remoteObjects( const TQString & remApp ) TQStringList JSDCOPClient::registeredApplications( ) { TQStringList returnList; - QCStringList lst = kapp->dcopClient()->registeredApplications( ); + QCStringList lst = tdeApp->dcopClient()->registeredApplications( ); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; @@ -678,12 +676,12 @@ TQStringList JSDCOPClient::registeredApplications( ) 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); + return tdeApp->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) { - return kapp->dcopClient()->disconnectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1()); + return tdeApp->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 |
