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

diff --git a/src/client/coreaccount.h b/src/client/coreaccount.h
index 8913b2e4..4caa28a3 100644
--- a/src/client/coreaccount.h
+++ b/src/client/coreaccount.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 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  *
@@ -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; }
@@ -45,7 +48,6 @@ public:
     inline bool storePassword() const { return _storePassword; }
     inline QString hostName() const { return _hostName; }
     inline uint port() const { return _port; }
-    inline bool useSsl() const { return _useSsl; }
 
     inline QNetworkProxy::ProxyType proxyType() const { return _proxyType; }
     inline QString proxyUser() const { return _proxyUser; }
@@ -53,31 +55,31 @@ public:
     inline uint proxyPort() const { return _proxyPort; }
 
     void setAccountId(AccountId id);
-    void setAccountName(const QString &accountName);
-    void setUuid(const QUuid &uuid);
+    void setAccountName(const QString& accountName);
+    void setUuid(const QUuid& uuid);
     void setInternal(bool);
 
-    void setUser(const QString &user);
+    void setUser(const QString& user);
     void setStorePassword(bool);
-    void setHostName(const QString &hostname);
+    void setHostName(const QString& hostname);
     void setPort(uint port);
-    void setUseSsl(bool);
 
     void setProxyType(QNetworkProxy::ProxyType);
-    void setProxyUser(const QString &);
-    void setProxyHostName(const QString &);
+    void setProxyUser(const QString&);
+    void setProxyHostName(const QString&);
     void setProxyPort(uint);
 
     /* These might be overridden for KWallet/QtKeychain support */
     virtual inline QString password() const { return _password; }
-    virtual void setPassword(const QString &password);
+    virtual void setPassword(const QString& password);
     virtual inline QString proxyPassword() const { return _proxyPassword; }
-    virtual void setProxyPassword(const QString &);
+    virtual void setProxyPassword(const QString&);
 
     virtual QVariantMap toVariantMap(bool forcePassword = false) const;
-    virtual void fromVariantMap(const QVariantMap &);
+    virtual void fromVariantMap(const QVariantMap&);
 
-    bool operator==(const CoreAccount &other) const;
+    bool operator==(const CoreAccount& other) const;
+    bool operator!=(const CoreAccount& other) const;
 
 private:
     AccountId _accountId;
@@ -86,11 +88,10 @@ private:
     bool _internal;
     QString _user, _password, _hostName;
     uint _port;
-    bool _storePassword, _useSsl, _useProxy;
+    bool _storePassword{};
     QNetworkProxy::ProxyType _proxyType;
     QString _proxyUser, _proxyPassword, _proxyHostName;
     uint _proxyPort;
 };
 
-
-#endif
+QDebug operator<<(QDebug dbg, const CoreAccount& msg);