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

Timestamp:

Feb 11, 2010, 11:19:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

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

trunk/src/network/kernel/qhostaddress.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -420 +420 @@
     \class QHostAddress
     \brief The QHostAddress class provides an IP address.
-    \ingroup io
+    \ingroup 
     \inmodule QtNetwork
 
@@ -432 +432 @@
     using isIPv4Address() or isIPv6Address(), and retrieved with
     toIPv4Address(), toIPv6Address(), or toString().
+
+
+
 
     The class also supports common predefined addresses: \l Null, \l
@@ -524 +527 @@
 */
 QHostAddress::QHostAddress(const QHostAddress &address)
-    : d(new QHostAddressPrivate(*address.d))
+    : d(new QHostAddressPrivate(*address.d))
 {
 }
@@ -560 +563 @@
 QHostAddress::~QHostAddress()
 {
-    delete d;
 }
 
@@ -569 +571 @@
 QHostAddress &QHostAddress::operator=(const QHostAddress &address)
 {
-    *d = *address.d;
+    *d;
     return *this;
 }
@@ -1079 +1081 @@
 QDebug operator<<(QDebug d, const QHostAddress &address)
 {
-    d.maybeSpace() << "QHostAddress(" << address.toString() << ")";
+    d.maybeSpace() << "QHostAddress(" << address.toString() << ;
     return d.space();
 }