From 2a96ac6c8a0ea9b0307b862ef6a479934c820b78 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 17 Nov 2008 20:02:36 +0000 Subject: removed remaining bits of old dcop implementation git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2880 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/system/libkvisystem.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'src/modules/system') diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index 964922cec..29447176d 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -44,8 +44,8 @@ #include #endif -#ifdef COMPILE_KDE3_SUPPORT - #include +#ifdef COMPILE_KDE_SUPPORT + #include #endif KviPluginManager * g_pPluginManager; @@ -398,19 +398,19 @@ static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall *c) /* - @doc: system.dcop + @doc: system.dbus @keyterms: System information @type: function @title: - $system.dcop + $system.dbus @short: - Performs a DCOP call + Performs a DBus call @syntax: - $system.dcop(,,[,[,[,...]]]) + $system.dbus(,,,[,[,[,...]]]) @description: - This function allows performing simple DCOP calls without executing + This function allows performing simple Dbus calls without executing an external process. This feature is available ONLY when KDE support is compiled in the executable: this means that this function is absolutely non portable (don't use it in scripts that you're going to distribute). @@ -443,7 +443,7 @@ static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall *c) [/example] */ -static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) { bool bTestMode = false; @@ -451,12 +451,13 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c) QStringList parms; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("application",KVS_PT_NONEMPTYCSTRING,0,szApp) - KVSM_PARAMETER("objectid",KVS_PT_NONEMPTYCSTRING,0,szObj) - KVSM_PARAMETER("function",KVS_PT_NONEMPTYCSTRING,0,szFun) + KVSM_PARAMETER("service",KVS_PT_NONEMPTYCSTRING,0,szService) + KVSM_PARAMETER("path",KVS_PT_NONEMPTYCSTRING,0,szPath) + KVSM_PARAMETER("interface",KVS_PT_NONEMPTYCSTRING,0,szInterface) + KVSM_PARAMETER("method",KVS_PT_NONEMPTYCSTRING,0,szMethod) KVSM_PARAMETER("parameter_list",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,parms) KVSM_PARAMETERS_END(c) - +/* if((szApp.data()) && (szApp.length() > 1)) { if(*(szApp.data()) == '?') @@ -585,7 +586,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c) c->warning(__tr2qs("DCOP calls are available only when KDE support is compiled in")); c->returnValue()->setInteger(0); #endif - +*/ return true; } @@ -693,7 +694,7 @@ static bool system_module_init(KviModule * m) KVSM_REGISTER_FUNCTION(m,"osnodename",system_kvs_fnc_osnodename); KVSM_REGISTER_FUNCTION(m,"getenv",system_kvs_fnc_getenv); KVSM_REGISTER_FUNCTION(m,"hostname",system_kvs_fnc_hostname); - KVSM_REGISTER_FUNCTION(m,"dcop",system_kvs_fnc_dcop); + KVSM_REGISTER_FUNCTION(m,"dbus",system_kvs_fnc_dbus); KVSM_REGISTER_FUNCTION(m,"clipboard",system_kvs_fnc_clipboard); KVSM_REGISTER_FUNCTION(m,"selection",system_kvs_fnc_selection); KVSM_REGISTER_FUNCTION(m,"checkModule",system_kvs_fnc_checkModule); -- cgit v1.3.1-10-gc9f91