From 1b954f157fe43aa3da0026e7d871dc79c6ac0a0c Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sun, 6 Jun 2010 10:10:14 +0000
Subject: [PATCH] Fix variable name conflict

---
 src/bittorrent.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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