X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fcoreaccount.cpp;h=e599a51326d2708cfc7a252f48555557ca89aa11;hp=a9444ce36c66f747b03049b2a39fb78153832ba1;hb=efe4239f96f0cf10b1c94e87f8fdd21f3bdbe10e;hpb=e472996a053e11d21ffef4a30f7d37461239cdab

diff --git a/src/client/coreaccount.cpp b/src/client/coreaccount.cpp
index a9444ce3..e599a513 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-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,129 +15,159 @@
  *   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"
 
-CoreAccount::CoreAccount(AccountId accountId) {
-  _accountId = accountId;
-  _internal = false;
-  _port = 4242;
-  _storePassword = false;
-  _useSsl = true;
-  _useProxy = false;
-  _proxyType = QNetworkProxy::Socks5Proxy;
-  _proxyPort = 8080;
+CoreAccount::CoreAccount(AccountId accountId)
+{
+    _accountId = accountId;
+    _internal = false;
+    _port = 4242;
+    _storePassword = false;
+    _proxyType = QNetworkProxy::DefaultProxy;
+    _proxyPort = 8080;
 }
 
-void CoreAccount::setAccountId(AccountId id) {
-  _accountId = id;
+void CoreAccount::setAccountId(AccountId id)
+{
+    _accountId = id;
 }
 
-void CoreAccount::setAccountName(const QString &name) {
-  _accountName = name;
+void CoreAccount::setAccountName(const QString& name)
+{
+    _accountName = name;
 }
 
-void CoreAccount::setUuid(const QUuid &uuid) {
-  _uuid = uuid;
+void CoreAccount::setUuid(const QUuid& uuid)
+{
+    _uuid = uuid;
 }
 
-void CoreAccount::setInternal(bool internal) {
-  _internal = internal;
+void CoreAccount::setInternal(bool internal)
+{
+    _internal = internal;
 }
 
-void CoreAccount::setUser(const QString &user) {
-  _user = user;
+void CoreAccount::setUser(const QString& user)
+{
+    _user = user;
 }
 
-void CoreAccount::setPassword(const QString &password) {
-  _password = password;
+void CoreAccount::setPassword(const QString& password)
+{
+    _password = password;
 }
 
-void CoreAccount::setStorePassword(bool store) {
-  _storePassword = store;
+void CoreAccount::setStorePassword(bool store)
+{
+    _storePassword = store;
 }
 
-void CoreAccount::setHostName(const QString &hostname) {
-  _hostName = hostname;
+void CoreAccount::setHostName(const QString& hostname)
+{
+    _hostName = hostname;
 }
 
-void CoreAccount::setPort(uint port) {
-  _port = port;
+void CoreAccount::setPort(uint port)
+{
+    _port = port;
 }
 
-void CoreAccount::setUseSsl(bool useSsl) {
-  _useSsl = useSsl;
+void CoreAccount::setProxyType(QNetworkProxy::ProxyType type)
+{
+    _proxyType = type;
 }
 
-void CoreAccount::setUseProxy(bool useProxy) {
-  _useProxy = useProxy;
+void CoreAccount::setProxyUser(const QString& proxyUser)
+{
+    _proxyUser = proxyUser;
 }
 
-void CoreAccount::setProxyType(QNetworkProxy::ProxyType type) {
-  _proxyType = type;
+void CoreAccount::setProxyPassword(const QString& proxyPassword)
+{
+    _proxyPassword = proxyPassword;
 }
 
-void CoreAccount::setProxyUser(const QString &proxyUser) {
-  _proxyUser = proxyUser;
+void CoreAccount::setProxyHostName(const QString& proxyHostName)
+{
+    _proxyHostName = proxyHostName;
 }
 
-void CoreAccount::setProxyPassword(const QString &proxyPassword) {
-  _proxyPassword = proxyPassword;
+void CoreAccount::setProxyPort(uint proxyPort)
+{
+    _proxyPort = proxyPort;
 }
 
-void CoreAccount::setProxyHostName(const QString &proxyHostName) {
-  _proxyHostName = proxyHostName;
+QVariantMap CoreAccount::toVariantMap(bool forcePassword) const
+{
+    QVariantMap v;
+    v["AccountId"] = accountId().toInt();  // can't use AccountId because then comparison fails
+    v["AccountName"] = accountName();
+    v["Uuid"] = uuid().toString();
+    v["Internal"] = isInternal();
+    v["User"] = user();
+    if (_storePassword || forcePassword)
+        v["Password"] = password();
+    else
+        v["Password"] = QString();
+    v["StorePassword"] = storePassword();
+    v["HostName"] = hostName();
+    v["Port"] = port();
+    v["ProxyType"] = proxyType();
+    v["ProxyUser"] = proxyUser();
+    v["ProxyPassword"] = proxyPassword();
+    v["ProxyHostName"] = proxyHostName();
+    v["ProxyPort"] = proxyPort();
+    return v;
 }
 
-void CoreAccount::setProxyPort(uint proxyPort) {
-  _proxyPort = proxyPort;
-}
+void CoreAccount::fromVariantMap(const QVariantMap& v)
+{
+    setAccountId((AccountId)v.value("AccountId").toInt());
+    setAccountName(v.value("AccountName").toString());
+    setUuid(QUuid(v.value("Uuid").toString()));
+    setInternal(v.value("Internal").toBool());
+    setUser(v.value("User").toString());
+    setPassword(v.value("Password").toString());
+    setStorePassword(v.value("StorePassword").toBool());
+    setHostName(v.value("HostName").toString());
+    setPort(v.value("Port").toUInt());
+    setProxyType((QNetworkProxy::ProxyType)v.value("ProxyType").toInt());
+    setProxyUser(v.value("ProxyUser").toString());
+    setProxyPassword(v.value("ProxyPassword").toString());
+    setProxyHostName(v.value("ProxyHostName").toString());
+    setProxyPort(v.value("ProxyPort").toUInt());
 
-QVariantMap CoreAccount::toVariantMap(bool forcePassword) const {
-  QVariantMap v;
-  v["AccountId"] = accountId().toInt(); // can't use AccountId because then comparison fails
-  v["AccountName"] = accountName();
-  v["Uuid"] = uuid().toString();
-  v["Internal"] = isInternal();
-  v["User"] = user();
-  if(_storePassword || forcePassword)
-    v["Password"] = password();
-  v["StorePassword"] = storePassword();
-  v["HostName"] = hostName();
-  v["Port"] = port();
-  v["UseSSL"] = useSsl();
-  v["UseProxy"] = useProxy();
-  v["ProxyType"] = proxyType();
-  v["ProxyUser"] = proxyUser();
-  v["ProxyPassword"] = proxyPassword();
-  v["ProxyHostName"] = proxyHostName();
-  v["ProxyPort"] = proxyPort();
-  return v;
+    _storePassword = !password().isEmpty();
 }
 
-void CoreAccount::fromVariantMap(const QVariantMap &v) {
-  setAccountId((AccountId)v.value("AccountId").toInt());
-  setAccountName(v.value("AccountName").toString());
-  setUuid(QUuid(v.value("Uuid").toString()));
-  setInternal(v.value("Internal").toBool());
-  setUser(v.value("User").toString());
-  setPassword(v.value("Password").toString());
-  setStorePassword(v.value("StorePassword").toBool());
-  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());
-  setProxyHostName(v.value("ProxyHostName").toString());
-  setProxyPort(v.value("ProxyPort").toUInt());
+bool CoreAccount::operator==(const CoreAccount& other) const
+{
+    return toVariantMap(true) == other.toVariantMap(true);
+}
 
-  _storePassword = !password().isEmpty();
+bool CoreAccount::operator!=(const CoreAccount& other) const
+{
+    return !(*this == other);
 }
 
-bool CoreAccount::operator==(const CoreAccount &o) const {
-  return toVariantMap(true) == o.toVariantMap(true);
+QDebug operator<<(QDebug dbg, const CoreAccount& acc)
+{
+    dbg.nospace() << qPrintable(QString("CoreAccount(AccountId:")) << acc.accountId()
+                  << qPrintable(QString(", AccountName:")) << acc.accountName()
+                  << qPrintable(QString(", Uuid:")) << acc.uuid()
+                  << qPrintable(QString(", Internal:")) << acc.isInternal()
+                  << qPrintable(QString(", User:")) << acc.user()
+                  << qPrintable(QString(", Password:")) << acc.password()
+                  << qPrintable(QString(", StorePassword:")) << acc.storePassword()
+                  << qPrintable(QString(", HostName:")) << acc.hostName()
+                  << qPrintable(QString(", Port:")) << acc.port()
+                  << qPrintable(QString(", ProxyType:")) << acc.proxyType()
+                  << qPrintable(QString(", ProxyUser:")) << acc.proxyUser()
+                  << qPrintable(QString(", ProxyPassword:")) << acc.proxyPassword()
+                  << qPrintable(QString(", ProxyHostName:")) << acc.proxyHostName()
+                  << qPrintable(QString(", ProxyPort:")) << acc.proxyPort();
+    return dbg.space();
 }