X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=eaa427c34a38c6e59581f14c0af254ca0352c48f;hp=da2956913b9a5e64749568ba64d8a43766dbf655;hb=ce221dcdce9f39596adf115b05057023c31bde4e;hpb=46827e485df7665e31b3ed340da9c2eb4e27bce6

diff --git a/src/common/network.h b/src/common/network.h
index da295691..eaa427c3 100644
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -758,44 +758,42 @@ private:
 
 
 //! Stores all editable information about a network (as opposed to runtime state).
-struct NetworkInfo {
-    // set some default values, note that this does not initialize e.g. name and id
-    NetworkInfo();
-
-    NetworkId networkId;
+struct NetworkInfo
+{
     QString networkName;
-    IdentityId identity;
-
-    bool useCustomEncodings; // not used!
-    QByteArray codecForServer;
-    QByteArray codecForEncoding;
-    QByteArray codecForDecoding;
 
     Network::ServerList serverList;
-    bool useRandomServer;
-
     QStringList perform;
 
-    bool useAutoIdentify;
-    QString autoIdentifyService;
+    QString autoIdentifyService{"NickServ"};
     QString autoIdentifyPassword;
 
-    bool useSasl;
     QString saslAccount;
     QString saslPassword;
 
-    bool useAutoReconnect;
-    quint32 autoReconnectInterval;
-    quint16 autoReconnectRetries;
-    bool unlimitedReconnectRetries;
-    bool rejoinChannels;
+    QByteArray codecForServer;
+    QByteArray codecForEncoding;
+    QByteArray codecForDecoding;
 
-    // Custom rate limiting
-    bool useCustomMessageRate;         /// If true, use custom rate limits, otherwise use defaults
-    quint32 messageRateBurstSize;      /// Maximum number of messages to send without any delays
-    quint32 messageRateDelay;          /// Delay in ms. for messages when max. burst messages sent
-    bool unlimitedMessageRate;         /// If true, disable rate limiting, otherwise apply limits
+    NetworkId networkId {0};
+    IdentityId identity {1};
+
+    quint32 messageRateBurstSize {5};     ///< Maximum number of messages to send without any delays
+    quint32 messageRateDelay     {2200};  ///< Delay in ms. for messages when max. burst messages sent
+
+    quint32 autoReconnectInterval {60};
+    quint16 autoReconnectRetries  {20};
+
+    bool rejoinChannels            {true};
+    bool useRandomServer           {false};
+    bool useAutoIdentify           {false};
+    bool useSasl                   {false};
+    bool useAutoReconnect          {true};
+    bool unlimitedReconnectRetries {false};
+    bool useCustomMessageRate      {false};  ///< If true, use custom rate limits, otherwise use defaults
+    bool unlimitedMessageRate      {false};  ///< If true, disable rate limiting, otherwise apply limits
 
+public:
     bool operator==(const NetworkInfo &other) const;
     bool operator!=(const NetworkInfo &other) const;
 };