X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fcoreaccount.h;h=b69552c5984bfaee056c1c5fcaba61b3781d8195;hp=c33afdf6144bc2d2ac6fa5b8de7b75b12d09f4bb;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222

diff --git a/src/client/coreaccount.h b/src/client/coreaccount.h
index c33afdf6..b69552c5 100644
--- a/src/client/coreaccount.h
+++ b/src/client/coreaccount.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 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  *
@@ -18,22 +18,25 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COREACCOUNT_H_
-#define COREACCOUNT_H_
+#pragma once
+
+#include "client-export.h"
 
 #include <QCoreApplication>
+#include <QDebug>
 #include <QNetworkProxy>
 #include <QUuid>
 #include <QVariantMap>
 
 #include "types.h"
-class CoreAccount
+
+class CLIENT_EXPORT CoreAccount
 {
     Q_DECLARE_TR_FUNCTIONS(CoreAccount)
 
 public:
     CoreAccount(AccountId accountId = 0);
-    virtual ~CoreAccount() {};
+    virtual ~CoreAccount() = default;
 
     inline bool isValid() const { return accountId().isValid(); }
     inline AccountId accountId() const { return _accountId; }
@@ -47,7 +50,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 +66,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; }
@@ -80,6 +81,7 @@ public:
     virtual void fromVariantMap(const QVariantMap &);
 
     bool operator==(const CoreAccount &other) const;
+    bool operator!=(const CoreAccount &other) const;
 
 private:
     AccountId _accountId;
@@ -88,11 +90,10 @@ private:
     bool _internal;
     QString _user, _password, _hostName;
     uint _port;
-    bool _storePassword, _useSsl, _useProxy;
+    bool _storePassword, _useSsl;
     QNetworkProxy::ProxyType _proxyType;
     QString _proxyUser, _proxyPassword, _proxyHostName;
     uint _proxyPort;
 };
 
-
-#endif
+QDebug operator<<(QDebug dbg, const CoreAccount &msg);