X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fcoreaccount.cpp;h=6cb016815543c59c5ab952a3f59c5dbeeec0a1e7;hb=911f181e0e179eb51279c0880eb701a43163b8b5;hp=50524c496370f3d40017cab81371bbcd5f424ec9;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce;p=quassel.git

diff --git a/src/client/coreaccount.cpp b/src/client/coreaccount.cpp
index 50524c49..6cb01681 100644
--- a/src/client/coreaccount.cpp
+++ b/src/client/coreaccount.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by the Quassel Project                             *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "coreaccount.h"
@@ -27,8 +27,7 @@ CoreAccount::CoreAccount(AccountId accountId)
     _port = 4242;
     _storePassword = false;
     _useSsl = true;
-    _useProxy = false;
-    _proxyType = QNetworkProxy::Socks5Proxy;
+    _proxyType = QNetworkProxy::DefaultProxy;
     _proxyPort = 8080;
 }
 
@@ -93,12 +92,6 @@ void CoreAccount::setUseSsl(bool useSsl)
 }
 
 
-void CoreAccount::setUseProxy(bool useProxy)
-{
-    _useProxy = useProxy;
-}
-
-
 void CoreAccount::setProxyType(QNetworkProxy::ProxyType type)
 {
     _proxyType = type;
@@ -145,7 +138,6 @@ QVariantMap CoreAccount::toVariantMap(bool forcePassword) const
     v["HostName"] = hostName();
     v["Port"] = port();
     v["UseSSL"] = useSsl();
-    v["UseProxy"] = useProxy();
     v["ProxyType"] = proxyType();
     v["ProxyUser"] = proxyUser();
     v["ProxyPassword"] = proxyPassword();
@@ -167,7 +159,6 @@ void CoreAccount::fromVariantMap(const QVariantMap &v)
     setHostName(v.value("HostName").toString());
     setPort(v.value("Port").toUInt());
     setUseSsl(v.value("UseSSL").toBool());
-    setUseProxy(v.value("UseProxy").toBool());
     setProxyType((QNetworkProxy::ProxyType)v.value("ProxyType").toInt());
     setProxyUser(v.value("ProxyUser").toString());
     setProxyPassword(v.value("ProxyPassword").toString());