Changeset 846 for trunk/src/network/kernel/qhostaddress.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/kernel/qhostaddress.cpp (modified) (6 diffs)

trunk/src/network/kernel/qhostaddress.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -429 +429 @@
     and QUdpSocket to connect to a host or to set up a server.
 
-    A host address is set with setAddress(), checked for its type
-    using isIPv4Address() or isIPv6Address(), and retrieved with
-    toIPv4Address(), toIPv6Address(), or toString().
+    A host address is set with setAddress(), and retrieved with
+    toIPv4Address(), toIPv6Address(), or toString(). You can check the
+    type with protocol().
 
     \note Please note that QHostAddress does not do DNS lookups.
@@ -680 +680 @@
     2130706433 (i.e. 0x7f000001).
 
-    This value is only valid if isIp4Addr() returns true.
+    This value is only valid if the Protocol() is
+    \l{QAbstractSocket::}{IPv4Protocol}.
 
     \sa toString()
@@ -705 +706 @@
     \snippet doc/src/snippets/code/src_network_kernel_qhostaddress.cpp 0
 
-    This value is only valid if isIPv6Address() returns true.
+    This value is only valid if the protocol() is
+    \l{QAbstractSocket::}{IPv6Protocol}.
 
     \sa toString()
@@ -1098 +1100 @@
     to the stream.
 
-    \sa {Format of the QDataStream operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream &operator<<(QDataStream &out, const QHostAddress &address)
@@ -1128 +1130 @@
     reference to the stream.
 
-    \sa {Format of the QDataStream operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream &operator>>(QDataStream &in, QHostAddress &address)