clang-tidy: Reorder NetworkInfo attributes to avoid excessive padding

[quassel.git] / src / common / network.cpp

diff --git a/src/common/network.cpp b/src/common/network.cpp
index dcca4f4..f2a8e1f 100644 (file)
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -1159,54 +1159,34 @@ void Network::determinePrefixes() const
  * NetworkInfo
  ************************************************************************/
 
-NetworkInfo::NetworkInfo()
-    : networkId(0),
-    identity(1),
-    useRandomServer(false),
-    useAutoIdentify(false),
-    autoIdentifyService("NickServ"),
-    useSasl(false),
-    useAutoReconnect(true),
-    autoReconnectInterval(60),
-    autoReconnectRetries(20),
-    unlimitedReconnectRetries(false),
-    rejoinChannels(true),
-    useCustomMessageRate(false),
-    messageRateBurstSize(5),
-    messageRateDelay(2200),
-    unlimitedMessageRate(false)
-{
-}
-
 
 bool NetworkInfo::operator==(const NetworkInfo &other) const
 {
-    if (networkId != other.networkId) return false;
-    if (networkName != other.networkName) return false;
-    if (identity != other.identity) return false;
-    if (codecForServer != other.codecForServer) return false;
-    if (codecForEncoding != other.codecForEncoding) return false;
-    if (codecForDecoding != other.codecForDecoding) return false;
-    if (serverList != other.serverList) return false;
-    if (useRandomServer != other.useRandomServer) return false;
-    if (perform != other.perform) return false;
-    if (useAutoIdentify != other.useAutoIdentify) return false;
-    if (autoIdentifyService != other.autoIdentifyService) return false;
-    if (autoIdentifyPassword != other.autoIdentifyPassword) return false;
-    if (useSasl != other.useSasl) return false;
-    if (saslAccount != other.saslAccount) return false;
-    if (saslPassword != other.saslPassword) return false;
-    if (useAutoReconnect != other.useAutoReconnect) return false;
-    if (autoReconnectInterval != other.autoReconnectInterval) return false;
-    if (autoReconnectRetries != other.autoReconnectRetries) return false;
-    if (unlimitedReconnectRetries != other.unlimitedReconnectRetries) return false;
-    if (rejoinChannels != other.rejoinChannels) return false;
-    // Custom rate limiting
-    if (useCustomMessageRate != other.useCustomMessageRate) return false;
-    if (messageRateBurstSize != other.messageRateBurstSize) return false;
-    if (messageRateDelay != other.messageRateDelay) return false;
-    if (unlimitedMessageRate != other.unlimitedMessageRate) return false;
-    return true;
+    return     networkName               == other.networkName
+            && serverList                == other.serverList
+            && perform                   == other.perform
+            && autoIdentifyService       == other.autoIdentifyService
+            && autoIdentifyPassword      == other.autoIdentifyPassword
+            && saslAccount               == other.saslAccount
+            && saslPassword              == other.saslPassword
+            && codecForServer            == other.codecForServer
+            && codecForEncoding          == other.codecForEncoding
+            && codecForDecoding          == other.codecForDecoding
+            && networkId                 == other.networkId
+            && identity                  == other.identity
+            && messageRateBurstSize      == other.messageRateBurstSize
+            && messageRateDelay          == other.messageRateDelay
+            && autoReconnectInterval     == other.autoReconnectInterval
+            && autoReconnectRetries      == other.autoReconnectRetries
+            && rejoinChannels            == other.rejoinChannels
+            && useRandomServer           == other.useRandomServer
+            && useAutoIdentify           == other.useAutoIdentify
+            && useSasl                   == other.useSasl
+            && useAutoReconnect          == other.useAutoReconnect
+            && unlimitedReconnectRetries == other.unlimitedReconnectRetries
+            && useCustomMessageRate      == other.useCustomMessageRate
+            && unlimitedMessageRate      == other.unlimitedMessageRate
+        ;
 }
 
 
@@ -1219,31 +1199,30 @@ bool NetworkInfo::operator!=(const NetworkInfo &other) const
 QDataStream &operator<<(QDataStream &out, const NetworkInfo &info)
 {
     QVariantMap i;
-    i["NetworkId"] = QVariant::fromValue<NetworkId>(info.networkId);
-    i["NetworkName"] = info.networkName;
-    i["Identity"] = QVariant::fromValue<IdentityId>(info.identity);
-    i["CodecForServer"] = info.codecForServer;
-    i["CodecForEncoding"] = info.codecForEncoding;
-    i["CodecForDecoding"] = info.codecForDecoding;
-    i["ServerList"] = toVariantList(info.serverList);
-    i["UseRandomServer"] = info.useRandomServer;
-    i["Perform"] = info.perform;
-    i["UseAutoIdentify"] = info.useAutoIdentify;
-    i["AutoIdentifyService"] = info.autoIdentifyService;
-    i["AutoIdentifyPassword"] = info.autoIdentifyPassword;
-    i["UseSasl"] = info.useSasl;
-    i["SaslAccount"] = info.saslAccount;
-    i["SaslPassword"] = info.saslPassword;
-    i["UseAutoReconnect"] = info.useAutoReconnect;
-    i["AutoReconnectInterval"] = info.autoReconnectInterval;
-    i["AutoReconnectRetries"] = info.autoReconnectRetries;
+    i["NetworkName"]               = info.networkName;
+    i["ServerList"]                = toVariantList(info.serverList);
+    i["Perform"]                   = info.perform;
+    i["AutoIdentifyService"]       = info.autoIdentifyService;
+    i["AutoIdentifyPassword"]      = info.autoIdentifyPassword;
+    i["SaslAccount"]               = info.saslAccount;
+    i["SaslPassword"]              = info.saslPassword;
+    i["CodecForServer"]            = info.codecForServer;
+    i["CodecForEncoding"]          = info.codecForEncoding;
+    i["CodecForDecoding"]          = info.codecForDecoding;
+    i["NetworkId"]                 = QVariant::fromValue<NetworkId>(info.networkId);
+    i["Identity"]                  = QVariant::fromValue<IdentityId>(info.identity);
+    i["MessageRateBurstSize"]      = info.messageRateBurstSize;
+    i["MessageRateDelay"]          = info.messageRateDelay;
+    i["AutoReconnectInterval"]     = info.autoReconnectInterval;
+    i["AutoReconnectRetries"]      = info.autoReconnectRetries;
+    i["RejoinChannels"]            = info.rejoinChannels;
+    i["UseRandomServer"]           = info.useRandomServer;
+    i["UseAutoIdentify"]           = info.useAutoIdentify;
+    i["UseSasl"]                   = info.useSasl;
+    i["UseAutoReconnect"]          = info.useAutoReconnect;
     i["UnlimitedReconnectRetries"] = info.unlimitedReconnectRetries;
-    i["RejoinChannels"] = info.rejoinChannels;
-    // Custom rate limiting
-    i["UseCustomMessageRate"] = info.useCustomMessageRate;
-    i["MessageRateBurstSize"] = info.messageRateBurstSize;
-    i["MessageRateDelay"] = info.messageRateDelay;
-    i["UnlimitedMessageRate"] = info.unlimitedMessageRate;
+    i["UseCustomMessageRate"]      = info.useCustomMessageRate;
+    i["UnlimitedMessageRate"]      = info.unlimitedMessageRate;
     out << i;
     return out;
 }
@@ -1253,31 +1232,30 @@ QDataStream &operator>>(QDataStream &in, NetworkInfo &info)
 {
     QVariantMap i;
     in >> i;
-    info.networkId = i["NetworkId"].value<NetworkId>();
-    info.networkName = i["NetworkName"].toString();
-    info.identity = i["Identity"].value<IdentityId>();
-    info.codecForServer = i["CodecForServer"].toByteArray();
-    info.codecForEncoding = i["CodecForEncoding"].toByteArray();
-    info.codecForDecoding = i["CodecForDecoding"].toByteArray();
-    info.serverList = fromVariantList<Network::Server>(i["ServerList"].toList());
-    info.useRandomServer = i["UseRandomServer"].toBool();
-    info.perform = i["Perform"].toStringList();
-    info.useAutoIdentify = i["UseAutoIdentify"].toBool();
-    info.autoIdentifyService = i["AutoIdentifyService"].toString();
-    info.autoIdentifyPassword = i["AutoIdentifyPassword"].toString();
-    info.useSasl = i["UseSasl"].toBool();
-    info.saslAccount = i["SaslAccount"].toString();
-    info.saslPassword = i["SaslPassword"].toString();
-    info.useAutoReconnect = i["UseAutoReconnect"].toBool();
-    info.autoReconnectInterval = i["AutoReconnectInterval"].toUInt();
-    info.autoReconnectRetries = i["AutoReconnectRetries"].toInt();
+    info.networkName               = i["NetworkName"].toString();
+    info.serverList                = fromVariantList<Network::Server>(i["ServerList"].toList());
+    info.perform                   = i["Perform"].toStringList();
+    info.autoIdentifyService       = i["AutoIdentifyService"].toString();
+    info.autoIdentifyPassword      = i["AutoIdentifyPassword"].toString();
+    info.saslAccount               = i["SaslAccount"].toString();
+    info.saslPassword              = i["SaslPassword"].toString();
+    info.codecForServer            = i["CodecForServer"].toByteArray();
+    info.codecForEncoding          = i["CodecForEncoding"].toByteArray();
+    info.codecForDecoding          = i["CodecForDecoding"].toByteArray();
+    info.networkId                 = i["NetworkId"].value<NetworkId>();
+    info.identity                  = i["Identity"].value<IdentityId>();
+    info.messageRateBurstSize      = i["MessageRateBurstSize"].toUInt();
+    info.messageRateDelay          = i["MessageRateDelay"].toUInt();
+    info.autoReconnectInterval     = i["AutoReconnectInterval"].toUInt();
+    info.autoReconnectRetries      = i["AutoReconnectRetries"].toInt();
+    info.rejoinChannels            = i["RejoinChannels"].toBool();
+    info.useRandomServer           = i["UseRandomServer"].toBool();
+    info.useAutoIdentify           = i["UseAutoIdentify"].toBool();
+    info.useSasl                   = i["UseSasl"].toBool();
+    info.useAutoReconnect          = i["UseAutoReconnect"].toBool();
     info.unlimitedReconnectRetries = i["UnlimitedReconnectRetries"].toBool();
-    info.rejoinChannels = i["RejoinChannels"].toBool();
-    // Custom rate limiting
-    info.useCustomMessageRate = i["UseCustomMessageRate"].toBool();
-    info.messageRateBurstSize = i["MessageRateBurstSize"].toUInt();
-    info.messageRateDelay = i["MessageRateDelay"].toUInt();
-    info.unlimitedMessageRate = i["UnlimitedMessageRate"].toBool();
+    info.useCustomMessageRate      = i["UseCustomMessageRate"].toBool();
+    info.unlimitedMessageRate      = i["UnlimitedMessageRate"].toBool();
     return in;
 }