diff options
| author | Slávek Banko <[email protected]> | 2021-01-14 02:37:59 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2021-01-15 15:15:43 +0100 |
| commit | ab700191fa487a238d9cd03c81c9e1ef7124548f (patch) | |
| tree | c1d1e65ad31314bbe1aa782b2b699a52ca5c0cde /src/newfirstrunwizard.ui.h | |
| parent | fbb5b1424b098b844b4f744cdeea97ba5279764f (diff) | |
| download | tork-ab700191fa487a238d9cd03c81c9e1ef7124548f.tar.gz tork-ab700191fa487a238d9cd03c81c9e1ef7124548f.zip | |
Added controlled conversions to char* instead of automatic ascii conversions.
The definition of -UTQT_NO_ASCII_CAST is no longer needed.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 355f00c2bd6f4b2870133d0423420ef8046b7156)
Diffstat (limited to 'src/newfirstrunwizard.ui.h')
| -rw-r--r-- | src/newfirstrunwizard.ui.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/newfirstrunwizard.ui.h b/src/newfirstrunwizard.ui.h index db6b08e..3b612b8 100644 --- a/src/newfirstrunwizard.ui.h +++ b/src/newfirstrunwizard.ui.h @@ -295,9 +295,9 @@ FirstRunWizard::accept() paths = ":/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin"; paths.replace("::",":"); - torknetstat = getFullLocation(paths,"torknetstat");; + torknetstat = getFullLocation(paths.local8Bit(), "torknetstat"); - if (torknetstat) + if (!torknetstat.isEmpty()) TorkConfig::setNetstatLocation("torknetstat"); else TorkConfig::setNetstatLocation("netstat"); @@ -332,12 +332,12 @@ FirstRunWizard::accept() TorkConfig::setOriginalHttpProxy(OriginalHttpProxy); TorkConfig::setOriginalHttpsProxy(OriginalHttpsProxy); TorkConfig::setOriginalProxyType(OriginalProxyType); - TorkConfig::setOriginalCookies(OriginalCookies); - TorkConfig::setOriginalUseCache(OriginalUseCache); - TorkConfig::setOriginalSendUserAgent(OriginalSendUserAgent); - TorkConfig::setOriginalEnableJavascript(OriginalEnableJavascript); - TorkConfig::setOriginalEnableJava(OriginalEnableJava); - TorkConfig::setOriginalEnablePlugins(OriginalEnablePlugins); + TorkConfig::setOriginalCookies(OriginalCookies == "true"); + TorkConfig::setOriginalUseCache(OriginalUseCache == "true"); + TorkConfig::setOriginalSendUserAgent(OriginalSendUserAgent == "true"); + TorkConfig::setOriginalEnableJavascript(OriginalEnableJavascript == "true"); + TorkConfig::setOriginalEnableJava(OriginalEnableJava == "true"); + TorkConfig::setOriginalEnablePlugins(OriginalEnablePlugins == "true"); //Anon Proxy Settings |