squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-18 14:38:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix variable name conflict

Browse Source
This commit is contained in:
Christophe Dumez
2010-06-06 10:10:14 +00:00
parent e8931c5747
commit 1b954f157f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bittorrent.cpp
View File

@@ -1866,16 +1866,16 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
} }
// We need this for urllib in search engine plugins // We need this for urllib in search engine plugins
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
QString proxyType; QString type_str;
if(proxySettings.type == proxy_settings::socks5 || proxySettings.type == proxy_settings::socks5_pw) if(proxySettings.type == proxy_settings::socks5 || proxySettings.type == proxy_settings::socks5_pw)
proxyType = "sock_proxy"; type_str = "sock_proxy";
else else
proxyType = "http_proxy"; type_str = "http_proxy";
#ifdef MINGW #ifdef MINGW
QString tmp = proxyType+"="+proxy_str; QString tmp = type_str+"="+proxy_str;
putenv(tmp.toLocal8Bit().constData()); putenv(tmp.toLocal8Bit().constData());
#else #else
SetEnvironmentVariableA(proxyType.toLocal8Bit().constData(), proxy_str.toLocal8Bit().constData()); SetEnvironmentVariableA(type_str.toLocal8Bit().constData(), proxy_str.toLocal8Bit().constData());
#endif #endif
#else #else
qDebug("HTTP communications proxy string: %s", qPrintable(proxy_str)); qDebug("HTTP communications proxy string: %s", qPrintable(proxy_str));