Use QRandomGenerator instead of q?rand

Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

4 files changed, 10 insertions, 6 deletions

diff --git a/src/imports/audioengine/qdeclarative_playvariation_p.cpp b/src/imports/audioengine/qdeclarative_playvariation_p.cpp
index 36ffca668..5dd88506b 100644
--- a/src/imports/audioengine/qdeclarative_playvariation_p.cpp
+++ b/src/imports/audioengine/qdeclarative_playvariation_p.cpp
@@ -41,6 +41,7 @@
 #include "qdeclarative_audioengine_p.h"
 #include "qsoundinstance_p.h"
 #include "qdebug.h"
+#include "qrandom.h"
 
 #define DEBUG_AUDIOENGINE
 
@@ -272,7 +273,7 @@ void QDeclarativePlayVariation::setSampleObject(QDeclarativeAudioSample *sampleO
 
 void QDeclarativePlayVariation::applyParameters(QSoundInstance *soundInstance)
 {
-    qreal pitch = qreal(qrand() % 1001) * 0.001f * (m_maxPitch - m_minPitch) + m_minPitch;
-    qreal gain = qreal(qrand() % 1001) * 0.001f * (m_maxGain - m_minGain) + m_minGain;
+    qreal pitch = QRandomGenerator::bounded(1001 * 0.001f) * (m_maxPitch - m_minPitch) + m_minPitch;
+    qreal gain = QRandomGenerator::bounded(1001 * 0.001f) * (m_maxGain - m_minGain) + m_minGain;
     soundInstance->updateVariationParameters(pitch, gain, m_looping);
 }
diff --git a/src/imports/audioengine/qdeclarative_sound_p.cpp b/src/imports/audioengine/qdeclarative_sound_p.cpp
index 0849215be..adbe9e53a 100644
--- a/src/imports/audioengine/qdeclarative_sound_p.cpp
+++ b/src/imports/audioengine/qdeclarative_sound_p.cpp
@@ -43,6 +43,7 @@
 #include "qdeclarative_soundinstance_p.h"
 #include "qdeclarative_audioengine_p.h"
 #include "qdebug.h"
+#include "qrandom.h"
 
 #define DEBUG_AUDIOENGINE
 
@@ -316,7 +317,7 @@ int QDeclarativeSound::genVariationIndex(int oldVariationIndex)
         case QDeclarativeSound::Random: {
             if (oldVariationIndex < 0)
                 oldVariationIndex = 0;
-            return (oldVariationIndex + (qrand() % (m_playlist.count() + 1))) % m_playlist.count();
+            return (oldVariationIndex + (QRandomGenerator::bounded(m_playlist.count() + 1))) % m_playlist.count();
         }
         default:
             return (oldVariationIndex + 1) % m_playlist.count();
diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
index a4ad97251..50db4fad2 100644
--- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
+++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
@@ -42,6 +42,7 @@
 #include "qmediacontent.h"
 #include "qmediaobject_p.h"
 #include "qplaylistfileparser_p.h"
+#include "qrandom.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -266,7 +267,7 @@ void QMediaNetworkPlaylistProvider::shuffle()
         QList<QMediaContent> resources;
 
         while (!d->resources.isEmpty()) {
-            resources.append(d->resources.takeAt(qrand() % d->resources.size()));
+            resources.append(d->resources.takeAt(QRandomGenerator::bounded(d->resources.size())));
         }
 
         d->resources = resources;
diff --git a/src/multimedia/playback/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp
index 192fd463c..0bacbf2ba 100644
--- a/src/multimedia/playback/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp
@@ -43,6 +43,7 @@
 #include "qmediaobject_p.h"
 
 #include <QtCore/qdebug.h>
+#include <QtCore/qrandom.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -124,7 +125,7 @@ int QMediaPlaylistNavigatorPrivate::nextItemPos(int steps) const
                     randomModePositions.append(-1);
                 int res = randomModePositions[randomPositionsOffset+steps];
                 if (res<0 || res >= playlist->mediaCount()) {
-                    res = qrand() % playlist->mediaCount();
+                    res = QRandomGenerator::bounded(playlist->mediaCount());
                     randomModePositions[randomPositionsOffset+steps] = res;
                 }
 
@@ -177,7 +178,7 @@ int QMediaPlaylistNavigatorPrivate::previousItemPos(int steps) const
 
                 int res = randomModePositions[randomPositionsOffset-steps];
                 if (res<0 || res >= playlist->mediaCount()) {
-                    res = qrand() % playlist->mediaCount();
+                    res = QRandomGenerator::bounded(playlist->mediaCount());
                     randomModePositions[randomPositionsOffset-steps] = res;
                 }