summaryrefslogtreecommitdiffstats
path: root/src/network/kernel/qhostaddress.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2015-03-05 23:39:22 -0800
committerThiago Macieira <thiago.macieira@intel.com>2015-03-12 02:47:05 +0000
commitaa246e487cc2daeee43e478dc969fa5649cafef4 (patch)
treef74fb78417c16f6f0aa9308b33114827783aeaca /src/network/kernel/qhostaddress.h
parent08e45154fb508162cb4bab104f6a7c9d00c2e50d (diff)
QHostAddress: add IPv6 address overloads that take const data
It has been a historical mistake that there wasn't a const overload. Change-Id: Ia0aac2f09e9245339951ffff13c8d8b70f206a99 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/kernel/qhostaddress.h')
-rw-r--r--src/network/kernel/qhostaddress.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h
index de3a79278e..0c2229c334 100644
--- a/src/network/kernel/qhostaddress.h
+++ b/src/network/kernel/qhostaddress.h
@@ -75,7 +75,8 @@ public:
QHostAddress();
explicit QHostAddress(quint32 ip4Addr);
- explicit QHostAddress(quint8 *ip6Addr);
+ explicit QHostAddress(quint8 *ip6Addr); // ### Qt 6: remove me
+ explicit QHostAddress(const quint8 *ip6Addr);
explicit QHostAddress(const Q_IPV6ADDR &ip6Addr);
explicit QHostAddress(const sockaddr *address);
explicit QHostAddress(const QString &address);
@@ -87,7 +88,8 @@ public:
QHostAddress &operator=(const QString &address);
void setAddress(quint32 ip4Addr);
- void setAddress(quint8 *ip6Addr);
+ void setAddress(quint8 *ip6Addr); // ### Qt 6: remove me
+ void setAddress(const quint8 *ip6Addr);
void setAddress(const Q_IPV6ADDR &ip6Addr);
void setAddress(const sockaddr *address);
bool setAddress(const QString &address);