From 690dd7a33ddc90678367d73adf313533536e10f2 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Fri, 29 Apr 2016 23:57:30 +0100 Subject: Apply clang-format --- src/modules/system/libkvisystem.cpp | 284 ++++++++++++++++++------------------ 1 file changed, 144 insertions(+), 140 deletions(-) (limited to 'src/modules/system/libkvisystem.cpp') diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index b162b6820..9404b5a26 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -40,21 +40,21 @@ #include #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) - #include - #include - #include +#include +#include +#include #endif #ifdef COMPILE_DBUS_SUPPORT - #include +#include #endif #ifdef COMPILE_KDE_SUPPORT - #include // invokeTerminal() for system.runcmd -#else // tools we need to work around the absence of - // invokeTerminal() - #include - #include +#include // invokeTerminal() for system.runcmd +#else // tools we need to work around the absence of +// invokeTerminal() +#include +#include #endif PluginManager * g_pPluginManager; @@ -94,13 +94,12 @@ static bool system_kvs_fnc_ostype(KviKvsModuleFunctionCall * c) the uname() syscall. */ -static bool system_kvs_fnc_osname(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_osname(KviKvsModuleFunctionCall * c) { c->returnValue()->setString(KviRuntimeInfo::name()); return true; } - /* @doc: system.osversion @type: @@ -115,7 +114,7 @@ static bool system_kvs_fnc_osname(KviKvsModuleFunctionCall *c) Returns the version of the operating system.[br] */ -static bool system_kvs_fnc_osversion(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_osversion(KviKvsModuleFunctionCall * c) { // no params to process c->returnValue()->setString(KviRuntimeInfo::version()); @@ -136,7 +135,7 @@ static bool system_kvs_fnc_osversion(KviKvsModuleFunctionCall *c) Returns the release of the operating system.[br] */ -static bool system_kvs_fnc_osrelease(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_osrelease(KviKvsModuleFunctionCall * c) { // no params to process c->returnValue()->setString(KviRuntimeInfo::release()); @@ -157,7 +156,7 @@ static bool system_kvs_fnc_osrelease(KviKvsModuleFunctionCall *c) Returns the machine of the operating system.[br] */ -static bool system_kvs_fnc_osmachine(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_osmachine(KviKvsModuleFunctionCall * c) { // no params to process c->returnValue()->setString(KviRuntimeInfo::machine()); @@ -178,7 +177,7 @@ static bool system_kvs_fnc_osmachine(KviKvsModuleFunctionCall *c) Returns the nodename of the operating system.[br] */ -static bool system_kvs_fnc_osnodename(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_osnodename(KviKvsModuleFunctionCall * c) { // no params to process c->returnValue()->setString(KviRuntimeInfo::nodename()); @@ -201,16 +200,16 @@ static bool system_kvs_fnc_osnodename(KviKvsModuleFunctionCall *c) Returns the value of the environment .[br] */ -static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall * c) { QString szVariable; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("variable",KVS_PT_NONEMPTYSTRING,0,szVariable) + KVSM_PARAMETER("variable", KVS_PT_NONEMPTYSTRING, 0, szVariable) KVSM_PARAMETERS_END(c) QByteArray szVar = szVariable.toLocal8Bit(); -/*#ifdef COMPILE_ON_WINDOWS + /*#ifdef COMPILE_ON_WINDOWS QString env= getenv(szVar.data()); QString def= __tr2qs("No environment variable found, please don't use the %% in the request"); c->returnValue()->setString(env.isEmpty() ? QString::fromLocal8Bit(env) : QString::fromLocal8Bit(def)); @@ -218,7 +217,7 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c) */ char * b = KviEnvironment::getVariable(szVar.data()); c->returnValue()->setString(b ? QString::fromLocal8Bit(b) : QString()); -//#endif + //#endif return true; } @@ -245,13 +244,12 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c) [cmd]system.setSelection[/cmd] */ -static bool system_kvs_fnc_clipboard(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_clipboard(KviKvsModuleFunctionCall * c) { c->returnValue()->setString(g_pApp->clipboard()->text(QClipboard::Clipboard)); return true; } - /* @doc: system.setClipboard @type: @@ -280,9 +278,9 @@ static bool system_kvs_cmd_setClipboard(KviKvsModuleCommandCall * c) QString szValue; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("data",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue) + KVSM_PARAMETER("data", KVS_PT_STRING, KVS_PF_OPTIONAL, szValue) KVSM_PARAMETERS_END(c) - g_pApp->clipboard()->setText(szValue,QClipboard::Clipboard); + g_pApp->clipboard()->setText(szValue, QClipboard::Clipboard); return true; } @@ -312,9 +310,9 @@ static bool system_kvs_cmd_setSelection(KviKvsModuleCommandCall * c) { QString szValue; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("data",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue) + KVSM_PARAMETER("data", KVS_PT_STRING, KVS_PF_OPTIONAL, szValue) KVSM_PARAMETERS_END(c) - g_pApp->clipboard()->setText(szValue,QClipboard::Selection); + g_pApp->clipboard()->setText(szValue, QClipboard::Selection); return true; } @@ -342,13 +340,12 @@ static bool system_kvs_cmd_setSelection(KviKvsModuleCommandCall * c) [cmd]system.setSelection[/cmd] */ -static bool system_kvs_fnc_selection(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_selection(KviKvsModuleFunctionCall * c) { c->returnValue()->setString(g_pApp->clipboard()->text(QClipboard::Selection)); return true; } - /* @doc: system.checkModule @keyterms: @@ -369,19 +366,18 @@ static bool system_kvs_fnc_selection(KviKvsModuleFunctionCall *c) KVIrc engine. */ -static bool system_kvs_fnc_checkModule(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_checkModule(KviKvsModuleFunctionCall * c) { QString szModuleName; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("module_name",KVS_PT_STRING,0,szModuleName) + KVSM_PARAMETER("module_name", KVS_PT_STRING, 0, szModuleName) KVSM_PARAMETERS_END(c) c->returnValue()->setBoolean(g_pModuleManager->loadModule(szModuleName)); return true; } - /* @doc: system.hostname @keyterms: @@ -398,14 +394,13 @@ static bool system_kvs_fnc_checkModule(KviKvsModuleFunctionCall *c) Returns the hostname of the machine that KVIrc is running on.[br] */ -static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall * c) { // no params to process c->returnValue()->setString(KviRuntimeInfo::hostname()); return true; } - /* @doc: system.dbus @keyterms: @@ -454,19 +449,19 @@ static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall *c) [/example] */ -static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall * c) { QString szService, szPath, szInterface, szMethod, szBusType; QStringList parms; - bool bRemoteTest=false; + bool bRemoteTest = false; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("service",KVS_PT_NONEMPTYSTRING,0,szService) - KVSM_PARAMETER("path",KVS_PT_NONEMPTYSTRING,0,szPath) - KVSM_PARAMETER("interface",KVS_PT_NONEMPTYSTRING,0,szInterface) - KVSM_PARAMETER("method",KVS_PT_NONEMPTYSTRING,0,szMethod) - KVSM_PARAMETER("bus_type",KVS_PT_STRING,KVS_PF_OPTIONAL,szBusType) - KVSM_PARAMETER("parameter_list",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,parms) + KVSM_PARAMETER("service", KVS_PT_NONEMPTYSTRING, 0, szService) + KVSM_PARAMETER("path", KVS_PT_NONEMPTYSTRING, 0, szPath) + KVSM_PARAMETER("interface", KVS_PT_NONEMPTYSTRING, 0, szInterface) + KVSM_PARAMETER("method", KVS_PT_NONEMPTYSTRING, 0, szMethod) + KVSM_PARAMETER("bus_type", KVS_PT_STRING, KVS_PF_OPTIONAL, szBusType) + KVSM_PARAMETER("parameter_list", KVS_PT_STRINGLIST, KVS_PF_OPTIONAL, parms) KVSM_PARAMETERS_END(c) #ifdef COMPILE_DBUS_SUPPORT @@ -479,17 +474,21 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) if(szBusType == "system") { busType = QDBusConnection::systemBus(); - } else if(szBusType == "session"){ + } + else if(szBusType == "session") + { busType = QDBusConnection::sessionBus(); - } else { + } + else + { c->warning(__tr2qs("No DBus type specified")); return false; } - if(szService.left(1).compare("?")==0) + if(szService.left(1).compare("?") == 0) { - szService.remove(0,1); - bRemoteTest=true; + szService.remove(0, 1); + bRemoteTest = true; } QDBusInterface remoteApp(szService, szPath, szInterface, busType); @@ -499,7 +498,9 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) { c->returnValue()->setInteger(0); return true; - } else { + } + else + { c->warning(__tr2qs("Invalid D-Bus interface")); return false; } @@ -513,7 +514,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) QList ds; - for ( QStringList::Iterator it = parms.begin(); it != parms.end(); ++it ) + for(QStringList::Iterator it = parms.begin(); it != parms.end(); ++it) { KviCString tmp = *it; @@ -523,11 +524,12 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) return false; } - KviCString szType = tmp.leftToFirst('=',false); - tmp.cutToFirst('=',true); - if(szType.isEmpty())szType = "int"; + KviCString szType = tmp.leftToFirst('=', false); + tmp.cutToFirst('=', true); + if(szType.isEmpty()) + szType = "int"; bool bOk; - if(kvi_strEqualCI("int",szType.ptr()) || kvi_strEqualCI("long",szType.ptr())) + if(kvi_strEqualCI("int", szType.ptr()) || kvi_strEqualCI("long", szType.ptr())) { int iii = tmp.toInt(&bOk); if(!bOk) @@ -536,19 +538,23 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) return false; } ds << iii; - } else if(kvi_strEqualCI("QString",szType.ptr())) + } + else if(kvi_strEqualCI("QString", szType.ptr())) { QString ddd = tmp.ptr(); ds << ddd; - } else if(kvi_strEqualCI("QByteArray",szType.ptr())) + } + else if(kvi_strEqualCI("QByteArray", szType.ptr())) { QByteArray qcs = tmp.ptr(); ds << qcs; - } else if(kvi_strEqualCI("bool",szType.ptr())) + } + else if(kvi_strEqualCI("bool", szType.ptr())) { - bool bbb = kvi_strEqualCI(tmp.ptr(),"true"); + bool bbb = kvi_strEqualCI(tmp.ptr(), "true"); ds << bbb; - } else if(kvi_strEqualCI("unsigned int",szType.ptr()) || kvi_strEqualCI("uint",szType.ptr()) || kvi_strEqualCI("Q_UINT32",szType.ptr())) + } + else if(kvi_strEqualCI("unsigned int", szType.ptr()) || kvi_strEqualCI("uint", szType.ptr()) || kvi_strEqualCI("Q_UINT32", szType.ptr())) { unsigned int uii = tmp.toUInt(&bOk); if(!bOk) @@ -557,23 +563,26 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) return false; } ds << uii; - } else { - c->warning(__tr2qs("Unsupported D-Bus parameter type %s"),tmp.ptr()); + } + else + { + c->warning(__tr2qs("Unsupported D-Bus parameter type %s"), tmp.ptr()); return false; } } QDBusMessage reply = remoteApp.callWithArgumentList(QDBus::Block, szMethod, ds); - if (reply.type() == QDBusMessage::ErrorMessage) + if(reply.type() == QDBusMessage::ErrorMessage) { QDBusError err = reply; - c->warning(__tr2qs("The D-Bus call returned an error \"%s\": %s"),qPrintable(err.name()), qPrintable(err.message())); + c->warning(__tr2qs("The D-Bus call returned an error \"%s\": %s"), qPrintable(err.name()), qPrintable(err.message())); return false; } QString szRetType; - foreach (QVariant v, reply.arguments()) { + foreach(QVariant v, reply.arguments()) + { switch(v.type()) { case QVariant::Bool: @@ -596,9 +605,9 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) QStringList csl(v.toStringList()); KviKvsArray * arry = new KviKvsArray(); int idx = 0; - for(QStringList::Iterator iter = csl.begin();iter != csl.end();++iter) + for(QStringList::Iterator iter = csl.begin(); iter != csl.end(); ++iter) { - arry->set(idx,new KviKvsVariant(*iter)); + arry->set(idx, new KviKvsVariant(*iter)); idx++; } c->returnValue()->setArray(arry); @@ -609,18 +618,17 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) c->returnValue()->setString(""); break; default: - c->warning(__tr2qs("Unsupported D-Bus call return type %s"),v.typeName()); + c->warning(__tr2qs("Unsupported D-Bus call return type %s"), v.typeName()); break; } } #else - c->warning(__tr2qs("D-Bus calls are available only under UNIX")); + c->warning(__tr2qs("D-Bus calls are available only under UNIX")); #endif return true; } - /* @doc: system.setenv @type: @@ -640,31 +648,31 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) [fnc]$system.getenv[/fnc] */ - static bool system_kvs_cmd_setenv(KviKvsModuleCommandCall * c) { - QString szVariable,szValue; + QString szVariable, szValue; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("variable",KVS_PT_NONEMPTYSTRING,0,szVariable) - KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue) + KVSM_PARAMETER("variable", KVS_PT_NONEMPTYSTRING, 0, szVariable) + KVSM_PARAMETER("value", KVS_PT_STRING, KVS_PF_OPTIONAL, szValue) KVSM_PARAMETERS_END(c) QByteArray szVar = szVariable.toLocal8Bit(); QByteArray szVal = szValue.toLocal8Bit(); - if(szVal.isEmpty())KviEnvironment::unsetVariable(szVar.data()); + if(szVal.isEmpty()) + KviEnvironment::unsetVariable(szVar.data()); else { -/*#ifdef COMPILE_ON_WINDOWS + /*#ifdef COMPILE_ON_WINDOWS QString Var,Val,VarAndVal; Val = szVar.data(); Var = szVal.data(); VarAndVal = Var+"="+Val; putenv(VarAndVal); #else*/ // <-- this stuff is implicit in KviEnvironment::setVariable: that's why we have the kvi_ version. - KviEnvironment::setVariable(szVar.data(),szVal.data()); -/*#endif*/ + KviEnvironment::setVariable(szVar.data(), szVal.data()); + /*#endif*/ } return true; } @@ -708,8 +716,7 @@ static bool system_kvs_cmd_setenv(KviKvsModuleCommandCall * c) [/example] */ - -static bool system_kvs_fnc_plugin_call(KviKvsModuleFunctionCall *c) +static bool system_kvs_fnc_plugin_call(KviKvsModuleFunctionCall * c) { return g_pPluginManager->pluginCall(c); } @@ -741,12 +748,12 @@ static bool system_kvs_fnc_plugin_call(KviKvsModuleFunctionCall *c) [/example] */ // implements https://github.com/kvirc/KVIrc/issues/459 -static bool system_kvs_cmd_runcmd(KviKvsModuleCommandCall *c) +static bool system_kvs_cmd_runcmd(KviKvsModuleCommandCall * c) { QString szCommand; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("command",KVS_PT_NONEMPTYSTRING,KVS_PF_APPENDREMAINING,szCommand) + KVSM_PARAMETER("command", KVS_PT_NONEMPTYSTRING, KVS_PF_APPENDREMAINING, szCommand) KVSM_PARAMETERS_END(c) if(szCommand.isEmpty()) @@ -756,7 +763,7 @@ static bool system_kvs_cmd_runcmd(KviKvsModuleCommandCall *c) QStringList args; QProcess oProc; -#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) // Only »cmd.exe /k« in the list. +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) // Only »cmd.exe /k« in the list. args << "/k" << szCommand; #elif defined(COMPILE_ON_MAC) args << "-e" << QString("tell application \"Terminal\" to do script \"%1\"").arg(szCommand); @@ -764,23 +771,21 @@ static bool system_kvs_cmd_runcmd(KviKvsModuleCommandCall *c) args << "-e" << szCommand; #endif // endif COMPILE_ON_WINDOWS - if(c->switches()->getAsStringIfExisting('t',"terminal",szTerminal)) + if(c->switches()->getAsStringIfExisting('t', "terminal", szTerminal)) { - if(!oProc.startDetached(szTerminal,args)) + if(!oProc.startDetached(szTerminal, args)) return c->error(__tr2qs("Failed to start the terminal program")); return true; } - - -#ifdef COMPILE_KDE_SUPPORT // We have invokeTerminal(). +#ifdef COMPILE_KDE_SUPPORT // We have invokeTerminal(). KToolInvocation::invokeTerminal(szCommand.toLocal8Bit()); -#else // No invokeTerminal() for us, we'll use a - // combination of QStringList and QProcess. +#else // No invokeTerminal() for us, we'll use a + // combination of QStringList and QProcess. QStringList szTerminals; -#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) // Only »cmd.exe /k« in the list. +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) // Only »cmd.exe /k« in the list. szTerminals.append("cmd.exe"); #elif defined(COMPILE_ON_MAC) szTerminals.append("osascript"); @@ -791,16 +796,16 @@ static bool system_kvs_cmd_runcmd(KviKvsModuleCommandCall *c) szTerminals.append("x-terminal-emulator"); szTerminals.append("terminal"); szTerminals.append("xterm"); -#endif // endif COMPILE_ON_WINDOWS +#endif // endif COMPILE_ON_WINDOWS QString szTerm; while(!szTerminals.isEmpty()) { - szTerm=szTerminals.takeFirst(); + szTerm = szTerminals.takeFirst(); if(oProc.startDetached(szTerm, args)) return true; } -#endif // endif COMPILE_KDE_SUPPORT +#endif // endif COMPILE_KDE_SUPPORT return c->error(__tr2qs("Failed to start the terminal program")); } @@ -831,36 +836,35 @@ static bool system_kvs_fnc_ntohi(KviKvsModuleFunctionCall * c) kvs_uint_t uBytes; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("value",KVS_PT_INT,0,iValue) - KVSM_PARAMETER("bytecount",KVS_PT_UINT,KVS_PF_OPTIONAL,uBytes) + KVSM_PARAMETER("value", KVS_PT_INT, 0, iValue) + KVSM_PARAMETER("bytecount", KVS_PT_UINT, KVS_PF_OPTIONAL, uBytes) KVSM_PARAMETERS_END(c) switch(uBytes) { case 0: c->returnValue()->setInteger((kvs_int_t)KviByteOrder::networkByteOrderToLocalCpu32((kvi_u32_t)iValue)); - break; + break; case 1: c->returnValue()->setInteger((kvs_int_t)((kvi_u8_t)iValue)); - break; + break; case 2: c->returnValue()->setInteger((kvs_int_t)KviByteOrder::networkByteOrderToLocalCpu16((kvi_u16_t)iValue)); - break; + break; case 4: c->returnValue()->setInteger((kvs_int_t)KviByteOrder::networkByteOrderToLocalCpu32((kvi_u32_t)iValue)); - break; + break; case 8: c->returnValue()->setInteger((kvs_int_t)KviByteOrder::networkByteOrderToLocalCpu64((kvi_u64_t)iValue)); - break; + break; default: return c->error(__tr2qs("Bad bytecount specification: 1, 2, 4 and 8 are allowed")); - break; + break; } return true; } - /* @doc: system.htoni @type: @@ -887,30 +891,30 @@ static bool system_kvs_fnc_htoni(KviKvsModuleFunctionCall * c) kvs_uint_t uBytes; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("value",KVS_PT_INT,0,iValue) - KVSM_PARAMETER("bytecount",KVS_PT_UINT,KVS_PF_OPTIONAL,uBytes) + KVSM_PARAMETER("value", KVS_PT_INT, 0, iValue) + KVSM_PARAMETER("bytecount", KVS_PT_UINT, KVS_PF_OPTIONAL, uBytes) KVSM_PARAMETERS_END(c) switch(uBytes) { case 0: c->returnValue()->setInteger((kvs_int_t)KviByteOrder::localCpuToNetworkByteOrder32((kvi_u32_t)iValue)); - break; + break; case 1: c->returnValue()->setInteger((kvs_int_t)((kvi_u8_t)iValue)); - break; + break; case 2: c->returnValue()->setInteger((kvs_int_t)KviByteOrder::localCpuToNetworkByteOrder16((kvi_u16_t)iValue)); - break; + break; case 4: c->returnValue()->setInteger((kvs_int_t)KviByteOrder::localCpuToNetworkByteOrder32((kvi_u32_t)iValue)); - break; + break; case 8: c->returnValue()->setInteger((kvs_int_t)KviByteOrder::localCpuToNetworkByteOrder64((kvi_u64_t)iValue)); - break; + break; default: return c->error(__tr2qs("Bad bytecount specification: 1, 2, 4 and 8 are allowed")); - break; + break; } return true; @@ -918,26 +922,26 @@ static bool system_kvs_fnc_htoni(KviKvsModuleFunctionCall * c) static bool system_module_init(KviModule * m) { - KVSM_REGISTER_FUNCTION(m,"ostype",system_kvs_fnc_ostype); - KVSM_REGISTER_FUNCTION(m,"osname",system_kvs_fnc_osname); - KVSM_REGISTER_FUNCTION(m,"osversion",system_kvs_fnc_osversion); - KVSM_REGISTER_FUNCTION(m,"osrelease",system_kvs_fnc_osrelease); - KVSM_REGISTER_FUNCTION(m,"osmachine",system_kvs_fnc_osmachine); - 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,"dbus",system_kvs_fnc_dbus); - KVSM_REGISTER_FUNCTION(m,"htoni",system_kvs_fnc_htoni); - KVSM_REGISTER_FUNCTION(m,"ntohi",system_kvs_fnc_ntohi); - 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); - KVSM_REGISTER_FUNCTION(m,"call",system_kvs_fnc_plugin_call); - - KVSM_REGISTER_SIMPLE_COMMAND(m,"setenv",system_kvs_cmd_setenv); - KVSM_REGISTER_SIMPLE_COMMAND(m,"setClipboard",system_kvs_cmd_setClipboard); - KVSM_REGISTER_SIMPLE_COMMAND(m,"setSelection",system_kvs_cmd_setSelection); - KVSM_REGISTER_SIMPLE_COMMAND(m,"runcmd",system_kvs_cmd_runcmd); + KVSM_REGISTER_FUNCTION(m, "ostype", system_kvs_fnc_ostype); + KVSM_REGISTER_FUNCTION(m, "osname", system_kvs_fnc_osname); + KVSM_REGISTER_FUNCTION(m, "osversion", system_kvs_fnc_osversion); + KVSM_REGISTER_FUNCTION(m, "osrelease", system_kvs_fnc_osrelease); + KVSM_REGISTER_FUNCTION(m, "osmachine", system_kvs_fnc_osmachine); + 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, "dbus", system_kvs_fnc_dbus); + KVSM_REGISTER_FUNCTION(m, "htoni", system_kvs_fnc_htoni); + KVSM_REGISTER_FUNCTION(m, "ntohi", system_kvs_fnc_ntohi); + 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); + KVSM_REGISTER_FUNCTION(m, "call", system_kvs_fnc_plugin_call); + + KVSM_REGISTER_SIMPLE_COMMAND(m, "setenv", system_kvs_cmd_setenv); + KVSM_REGISTER_SIMPLE_COMMAND(m, "setClipboard", system_kvs_cmd_setClipboard); + KVSM_REGISTER_SIMPLE_COMMAND(m, "setSelection", system_kvs_cmd_setSelection); + KVSM_REGISTER_SIMPLE_COMMAND(m, "runcmd", system_kvs_cmd_runcmd); g_pPluginManager = new(PluginManager); @@ -953,20 +957,20 @@ static bool system_module_cleanup(KviModule *) static bool system_module_can_unload(KviModule *) { - if(!g_pPluginManager->checkUnload()) return false; + if(!g_pPluginManager->checkUnload()) + return false; return true; } KVIRC_MODULE( - "System", // module name - "4.0.0", // module version - "Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)" \ - " (C) 2005 Tonino Imbesi (grifisx at barmes dot org)"\ - " (C) 2005 Alessandro Carbone (elfonol at gmail dot com)",// author & (C) - "System information module", - system_module_init, - system_module_can_unload, - 0, - system_module_cleanup, - 0 -) + "System", // module name + "4.0.0", // module version + "Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)" + " (C) 2005 Tonino Imbesi (grifisx at barmes dot org)" + " (C) 2005 Alessandro Carbone (elfonol at gmail dot com)", // author & (C) + "System information module", + system_module_init, + system_module_can_unload, + 0, + system_module_cleanup, + 0) -- cgit v1.3.1-10-gc9f91