From 2b7b24a0e039a18db8ab23475fbab44718f758a2 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 12 Jun 2017 15:28:13 -0700
Subject: Use QRandomGenerator instead of q?rand

Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/quick/items/qquickspriteengine.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/quick/items/qquickspriteengine.cpp')

diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp
index 92b60a8e3a..9deb223957 100644
--- a/src/quick/items/qquickspriteengine.cpp
+++ b/src/quick/items/qquickspriteengine.cpp
@@ -43,6 +43,7 @@
 #include <qqml.h>
 #include <QDebug>
 #include <QPainter>
+#include <QRandomGenerator>
 #include <QSet>
 #include <QtGui/qopengl.h>
 #include <QOpenGLFunctions>
@@ -543,7 +544,7 @@ void QQuickStochasticEngine::restart(int index)
     if (m_addAdvance)
         m_startTimes[index] += m_advanceTime.elapsed();
     if (randomStart)
-        m_startTimes[index] -= qrand() % m_duration.at(index);
+        m_startTimes[index] -= QRandomGenerator::bounded(m_duration.at(index));
     int time = m_duration.at(index) + m_startTimes.at(index);
     for (int i=0; i<m_stateUpdates.count(); i++)
         m_stateUpdates[i].second.removeAll(index);
@@ -557,13 +558,13 @@ void QQuickSpriteEngine::restart(int index) //Reimplemented to recognize and han
     if (m_loaded && m_sprites.at(m_things.at(index))->frameSync()) {//Manually advanced
         m_startTimes[index] = 0;
         if (randomStart && m_sprites.at(m_things.at(index))->m_generatedCount)
-            m_startTimes[index] += qrand() % m_sprites.at(m_things.at(index))->m_generatedCount;
+            m_startTimes[index] += QRandomGenerator::bounded(m_sprites.at(m_things.at(index))->m_generatedCount);
     } else {
         m_startTimes[index] = m_timeOffset;
         if (m_addAdvance)
             m_startTimes[index] += m_advanceTime.elapsed();
         if (randomStart)
-            m_startTimes[index] -= qrand() % m_duration.at(index);
+            m_startTimes[index] -= QRandomGenerator::bounded(m_duration.at(index));
         int time = spriteDuration(index) + m_startTimes.at(index);
         if (randomStart) {
             int curTime = m_timeOffset + (m_addAdvance ? m_advanceTime.elapsed() : 0);
@@ -629,7 +630,7 @@ int QQuickStochasticEngine::nextState(int curState, int curThing)
     int nextIdx = -1;
     int goalPath = goalSeek(curState, curThing);
     if (goalPath == -1){//Random
-        qreal r =(qreal) qrand() / (qreal) RAND_MAX;
+        qreal r = QRandomGenerator::getReal();
         qreal total = 0.0;
         for (QVariantMap::const_iterator iter=m_states.at(curState)->m_to.constBegin();
             iter!=m_states.at(curState)->m_to.constEnd(); ++iter)
@@ -719,7 +720,7 @@ int QQuickStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist)
             if (options.count()==1)
                 return *(options.begin());
             int option = -1;
-            qreal r =(qreal) qrand() / (qreal) RAND_MAX;
+            qreal r = QRandomGenerator::getReal();
             qreal total = 0;
             for (QSet<int>::const_iterator iter=options.constBegin();
                 iter!=options.constEnd(); ++iter)
-- 
cgit v1.2.3