X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=1275436379e5a2dc7994f7010ee2eb092763cdaa;hp=410931fd22742d08dae8481bd5d06c23ef04242e;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=92fc8c5b119111a35ab8423c3cbde5b2a022badf

diff --git a/src/common/network.h b/src/common/network.h
index 410931fd..12754363 100644
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -31,6 +31,7 @@
 #include <QPointer>
 #include <QMutex>
 #include <QByteArray>
+#include <utility>
 
 #include "types.h"
 #include "util.h"
@@ -116,37 +117,36 @@ public :
 
     struct Server {
         QString host;
-        uint port;
+        uint port{6667};
         QString password;
-        bool useSsl;
-        bool sslVerify;     /// If true, validate SSL certificates
-        int sslVersion;
+        bool useSsl{false};
+        bool sslVerify{true};     /// If true, validate SSL certificates
+        int sslVersion{0};
 
-        bool useProxy;
-        int proxyType;
+        bool useProxy{false};
+        int proxyType{QNetworkProxy::Socks5Proxy};
         QString proxyHost;
-        uint proxyPort;
+        uint proxyPort{8080};
         QString proxyUser;
         QString proxyPass;
 
         // sslVerify only applies when useSsl is true.  sslVerify should be enabled by default,
         // so enabling useSsl offers a more secure default.
-        Server() : port(6667), useSsl(false), sslVerify(true), sslVersion(0), useProxy(false),
-            proxyType(QNetworkProxy::Socks5Proxy), proxyHost("localhost"), proxyPort(8080) {}
+        Server() :  proxyHost("localhost") {}
 
-        Server(const QString &host, uint port, const QString &password, bool useSsl,
+        Server(QString host, uint port, QString password, bool useSsl,
                bool sslVerify)
-            : host(host), port(port), password(password), useSsl(useSsl), sslVerify(sslVerify),
-              sslVersion(0), useProxy(false), proxyType(QNetworkProxy::Socks5Proxy),
+            : host(std::move(host)), port(port), password(std::move(password)), useSsl(useSsl), sslVerify(sslVerify),
+               proxyType(QNetworkProxy::Socks5Proxy),
               proxyHost("localhost"), proxyPort(8080) {}
 
         bool operator==(const Server &other) const;
         bool operator!=(const Server &other) const;
     };
-    typedef QList<Server> ServerList;
+    using ServerList = QList<Server>;
 
-    Network(const NetworkId &networkid, QObject *parent = 0);
-    ~Network();
+    Network(const NetworkId &networkid, QObject *parent = nullptr);
+    ~Network() override;
 
     inline NetworkId networkId() const { return _networkId; }