X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fcoreaccount.cpp;h=ad0dedcd34e0af632ee582717f181b749c93e98d;hp=237ae70b30ef8a706fa8f0242bc77acc55f1f3c0;hb=3e63cb8a6e83765069a45101b86ae9e21dcc57ad;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/client/coreaccount.cpp b/src/client/coreaccount.cpp
index 237ae70b..ad0dedcd 100644
--- a/src/client/coreaccount.cpp
+++ b/src/client/coreaccount.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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  *
@@ -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());
@@ -178,7 +169,34 @@ void CoreAccount::fromVariantMap(const QVariantMap &v)
 }
 
 
-bool CoreAccount::operator==(const CoreAccount &o) const
+bool CoreAccount::operator==(const CoreAccount &other) const
+{
+    return toVariantMap(true) == other.toVariantMap(true);
+}
+
+
+bool CoreAccount::operator!=(const CoreAccount &other) const
+{
+    return !(*this == other);
+}
+
+
+QDebug operator<<(QDebug dbg, const CoreAccount &acc)
 {
-    return toVariantMap(true) == o.toVariantMap(true);
+    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(", UseSSL:")) << acc.useSsl()
+    << 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();
 }