Changeset 561 for trunk/src/corelib/plugin/quuid.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/corelib/plugin/quuid.cpp (modified) (9 diffs)

trunk/src/corelib/plugin/quuid.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 QtCore 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$
 **
@@ -51 +51 @@
 
     \reentrant
-    \ingroup misc
 
     Using \e{U}niversally \e{U}nique \e{ID}entifiers (UUID) is a
@@ -406 +405 @@
     return s;
 }
-#endif
+#endif
 
 /*!
@@ -550 +549 @@
     UUID with variant QUuid::DCE and version QUuid::Random. The random
     numbers used to construct the UUID are obtained from the local
-    pseudo-random generator, which is usually not a cryptographic
+    pseudo-random generator, which is usually not a cryptographic
     quality random number generator. Therefore, a UUID generated by
-    this function can't be guaranteed to be unique.
+    this function can't be guaranteed to be unique. If the pseudo-random
+    number generator for the calling thread has not yet been seeded, this
+    function will seed the pseudo-random number generator by calling qsrand().
 
     On a Windows platform, a GUID is generated, which almost certainly
@@ -559 +560 @@
     \sa variant(), version()
 */
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32)
 
 QT_BEGIN_INCLUDE_NAMESPACE
@@ -579 +580 @@
 #include "stdlib.h" // For srand/rand
 QT_END_INCLUDE_NAMESPACE
+
+
 
 QUuid QUuid::createUuid()
@@ -587 +590 @@
         int max = RAND_MAX;
         do { ++randbits; } while ((max=max>>1));
-        qsrand((uint)QDateTime::currentDateTime().toTime_t());
-        qrand(); // Skip first
-    }
+    }
+
+    // reseed, but only if not already seeded
+    qsrand();
 
     QUuid result;