X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fcoreaccount.h;h=8913b2e4c110dfa0a8e87072266f82679df89b47;hp=5ea6a1ca95ac978ffd3f0e4ec144914aa1a6b2e2;hb=9ddb5712b16b3219338871d346765bc649007de0;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/client/coreaccount.h b/src/client/coreaccount.h
index 5ea6a1ca..8913b2e4 100644
--- a/src/client/coreaccount.h
+++ b/src/client/coreaccount.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by the Quassel Project                             *
+ *   Copyright (C) 2005-2016 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.         *
  ***************************************************************************/
 
 #ifndef COREACCOUNT_H_
@@ -47,7 +47,6 @@ public:
     inline uint port() const { return _port; }
     inline bool useSsl() const { return _useSsl; }
 
-    inline bool useProxy() const { return _useProxy; }
     inline QNetworkProxy::ProxyType proxyType() const { return _proxyType; }
     inline QString proxyUser() const { return _proxyUser; }
     inline QString proxyHostName() const { return _proxyHostName; }
@@ -64,13 +63,12 @@ public:
     void setPort(uint port);
     void setUseSsl(bool);
 
-    void setUseProxy(bool);
     void setProxyType(QNetworkProxy::ProxyType);
     void setProxyUser(const QString &);
     void setProxyHostName(const QString &);
     void setProxyPort(uint);
 
-    /* These might be overridden for KWallet support */
+    /* These might be overridden for KWallet/QtKeychain support */
     virtual inline QString password() const { return _password; }
     virtual void setPassword(const QString &password);
     virtual inline QString proxyPassword() const { return _proxyPassword; }