diff options
author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-03-01 15:28:31 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-02 23:16:25 +0100 |
commit | 95d83cb1b68cc4a415d5d80859b4e74472ad7112 (patch) | |
tree | 9f6fa892ee78f584224320a195f03419c0fdbc21 /src/network/kernel/qhostaddress.cpp | |
parent | 15e136d4e116c1513c106dfbb75e1953a7f3463c (diff) |
Remove the usage of deprecated qdoc macros.
QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.
Task-number: QTBUG-24578
Change-Id: I519bf9c29b14092e3ab6067612f42bf749eeedf5
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/network/kernel/qhostaddress.cpp')
-rw-r--r-- | src/network/kernel/qhostaddress.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index dd46b8126b..230abb86aa 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -822,20 +822,20 @@ QString QHostAddress::toString() const \list - \o Node-local: Addresses that are only used for communicating with + \li Node-local: Addresses that are only used for communicating with services on the same interface (e.g., the loopback interface "::1"). - \o Link-local: Addresses that are local to the network interface + \li Link-local: Addresses that are local to the network interface (\e{link}). There is always one link-local address for each IPv6 interface on your host. Link-local addresses ("fe80...") are generated from the MAC address of the local network adaptor, and are not guaranteed to be unique. - \o Site-local: Addresses that are local to the site / private network + \li Site-local: Addresses that are local to the site / private network (e.g., the company intranet). Site-local addresses ("fec0...") are usually distributed by the site router, and are not guaranteed to be unique outside of the local site. - \o Global: For globally routable addresses, such as public servers on the + \li Global: For globally routable addresses, such as public servers on the Internet. \endlist @@ -1001,9 +1001,9 @@ bool QHostAddress::isInSubnet(const QPair<QHostAddress, int> &subnet) const This function supports arguments in the form: \list - \o 123.123.123.123/n where n is any value between 0 and 32 - \o 123.123.123.123/255.255.255.255 - \o <ipv6-address>/n where n is any value between 0 and 128 + \li 123.123.123.123/n where n is any value between 0 and 32 + \li 123.123.123.123/255.255.255.255 + \li <ipv6-address>/n where n is any value between 0 and 128 \endlist For IP version 4, this function accepts as well missing trailing |