From a1a2f81e9e131adc82330d0e20f02e00e3e12a25 Mon Sep 17 00:00:00 2001 From: Noldor Date: Sun, 13 Apr 2008 17:47:27 +0000 Subject: removed QT3 QString stuff (wip). Need test. git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1476 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/system/libkvisystem.cpp | 8 ++++---- src/modules/system/plugin.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/modules/system') diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index e65817b94..38023226a 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -201,7 +201,7 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c) KVSM_PARAMETER("variable",KVS_PT_NONEMPTYSTRING,0,szVariable) KVSM_PARAMETERS_END(c) - KviQCString szVar = szVariable.local8Bit(); + KviQCString szVar = szVariable.toLocal8Bit(); #ifdef COMPILE_ON_WINDOWS QString env = getenv(szVar.data()); QString def = __tr2qs("No environment variable found, please don't use the %% in the request"); @@ -368,7 +368,7 @@ static bool system_kvs_fnc_checkModule(KviKvsModuleFunctionCall *c) KVSM_PARAMETER("module_name",KVS_PT_STRING,0,szModuleName) KVSM_PARAMETERS_END(c) - c->returnValue()->setBoolean(g_pModuleManager->loadModule(szModuleName.utf8().data())); + c->returnValue()->setBoolean(g_pModuleManager->loadModule(szModuleName.toUtf8().data())); return true; } @@ -619,8 +619,8 @@ static bool system_kvs_cmd_setenv(KviKvsModuleCommandCall * c) KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue) KVSM_PARAMETERS_END(c) - KviQCString szVar = szVariable.local8Bit(); - KviQCString szVal = szValue.local8Bit(); + KviQCString szVar = szVariable.toLocal8Bit(); + KviQCString szVal = szValue.toLocal8Bit(); if(szVal.isEmpty())kvi_unsetenv(szVar.data()); else diff --git a/src/modules/system/plugin.cpp b/src/modules/system/plugin.cpp index 0b47e5872..b214c4aab 100644 --- a/src/modules/system/plugin.cpp +++ b/src/modules/system/plugin.cpp @@ -115,7 +115,7 @@ KviPlugin::~KviPlugin() KviPlugin* KviPlugin::load(const QString& szFileName) { - kvi_library_t pLibrary = kvi_library_open(szFileName.local8Bit()); + kvi_library_t pLibrary = kvi_library_open(szFileName.toLocal8Bit()); if (!pLibrary) { return 0; @@ -187,7 +187,7 @@ int KviPlugin::call(const QString& pszFunctionName, int argc, char * argv[], cha { int r; plugin_function function_call; - function_call = (plugin_function)kvi_library_symbol(m_Plugin,pszFunctionName.local8Bit()); + function_call = (plugin_function)kvi_library_symbol(m_Plugin,pszFunctionName.toLocal8Bit()); if (!function_call) { return -1; @@ -283,7 +283,7 @@ bool KviPluginManager::pluginCall(KviKvsModuleFunctionCall *c) { ppArgv[i-2] = x; c->params()->at(i)->asString(tmp); - strcpy(x,tmp.local8Bit()); + strcpy(x,tmp.toLocal8Bit()); x += tmp.length(); *x = 0; -- cgit v1.3.1-10-gc9f91