Optimise QHostAddress a little

In QHostAddress::setAddress(SpecialAddress), avoid parsing strings.

Change-Id: Icb756b4c8b06c21dbc231f8c7f0b0dac29ed97c3
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>

diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index 230abb8..9240434 100644 (file)
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -107,13 +107,14 @@ public:
     bool parse();
     void clear();
 
+    QString ipString;
+    QString scopeId;
+
     quint32 a;    // IPv4 address
     Q_IPV6ADDR a6; // IPv6 address
     QAbstractSocket::NetworkLayerProtocol protocol;
 
-    QString ipString;
     bool isParsed;
-    QString scopeId;
 
     friend class QHostAddress;
 };
@@ -556,23 +557,27 @@ QHostAddress::QHostAddress(const QHostAddress &address)
 QHostAddress::QHostAddress(SpecialAddress address)
     : d(new QHostAddressPrivate)
 {
+    Q_IPV6ADDR ip6;
+    memset(&ip6, 0, sizeof ip6);
+
     switch (address) {
     case Null:
         break;
     case Broadcast:
-        setAddress(QLatin1String("255.255.255.255"));
+        d->setAddress(quint32(-1));
         break;
     case LocalHost:
-        setAddress(QLatin1String("127.0.0.1"));
+        d->setAddress(0x7f000001);
         break;
     case LocalHostIPv6:
-        setAddress(QLatin1String("::1"));
+        ip6[15] = 1;
+        d->setAddress(ip6);
         break;
     case AnyIPv4:
-        setAddress(QLatin1String("0.0.0.0"));
+        setAddress(0u);
         break;
     case AnyIPv6:
-        setAddress(QLatin1String("::"));
+        d->setAddress(ip6);
         break;
     case Any:
         d->clear();