Changeset 561 for trunk/src/network/socket/qudpsocket.cpp

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/socket/qudpsocket.cpp (modified) (9 diffs)

trunk/src/network/socket/qudpsocket.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$
 **
@@ -47 +47 @@
     \brief The QUdpSocket class provides a UDP socket.
 
-    \ingroup io
+    \ingroup 
     \inmodule QtNetwork
 
@@ -71 +71 @@
     datagram, and readDatagram() to read it.
 
+
+
+
     Example:
 
@@ -92 +95 @@
     This enum describes the different flags you can pass to modify the
     behavior of QUdpSocket::bind().
+
+
+
+
+
+
+
 
     \value ShareAddress Allow other services to bind to the same address
@@ -348 +358 @@
     destination.
 
+
+
+
     \warning Calling this function on a connected UDP socket may
     result in an error and no packet being sent. If you are using a
@@ -366 +379 @@
 
     qint64 sent = d->socketEngine->writeDatagram(data, size, address, port);
+
+
+
+
+
+
+
+
+
+
     d->cachedSocketDescriptor = d->socketEngine->socketDescriptor();
 
@@ -378 +401 @@
 }
 
-/*! 
+/*!
     \fn qint64 QUdpSocket::writeDatagram(const QByteArray &datagram,
                                              const QHostAddress &host, quint16 port)