From 096b9122b939de19836b75718156cc8155e84621 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 12 Jun 2017 16:03:04 -0700
Subject: Use QRandomGenerator instead of q?rand

Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 examples/datavisualization/draggableaxes/data.cpp          | 10 +++++++---
 examples/datavisualization/itemmodel/main.cpp              |  4 +++-
 examples/datavisualization/qmloscilloscope/datasource.cpp  |  3 ++-
 examples/datavisualization/scatter/scatterdatamodifier.cpp | 10 +++++++---
 4 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'examples')

diff --git a/examples/datavisualization/draggableaxes/data.cpp b/examples/datavisualization/draggableaxes/data.cpp
index c2907c4d..67777cdc 100644
--- a/examples/datavisualization/draggableaxes/data.cpp
+++ b/examples/datavisualization/draggableaxes/data.cpp
@@ -29,6 +29,7 @@
 
 #include "data.h"
 
+#include <QtCore/QRandomGenerator>
 #include <QtDataVisualization/QScatterDataProxy>
 #include <QtDataVisualization/Q3DScene>
 #include <QtDataVisualization/Q3DCamera>
@@ -165,7 +166,10 @@ void Data::addData()
 QVector3D Data::randVector()
 {
     return QVector3D(
-                (float)(rand() % 100) / 2.0f - (float)(rand() % 100) / 2.0f,
-                (float)(rand() % 100) / 2.0f - (float)(rand() % 100) / 2.0f,
-                (float)(rand() % 100) / 2.0f - (float)(rand() % 100) / 2.0f);
+                (float)(QRandomGenerator::bounded(100)) / 2.0f -
+                (float)(QRandomGenerator::bounded(100)) / 2.0f,
+                (float)(QRandomGenerator::bounded(100)) / 2.0f -
+                (float)(QRandomGenerator::bounded(100)) / 2.0f,
+                (float)(QRandomGenerator::bounded(100)) / 2.0f -
+                (float)(QRandomGenerator::bounded(100)) / 2.0f);
 }
diff --git a/examples/datavisualization/itemmodel/main.cpp b/examples/datavisualization/itemmodel/main.cpp
index f2197785..f8564578 100644
--- a/examples/datavisualization/itemmodel/main.cpp
+++ b/examples/datavisualization/itemmodel/main.cpp
@@ -40,6 +40,7 @@
 #include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QTableWidget>
 #include <QtGui/QScreen>
+#include <QtCore/QRandomGenerator>
 #include <QtCore/QTimer>
 #include <QtGui/QFont>
 #include <QtCore/QDebug>
@@ -216,7 +217,8 @@ void GraphDataGenerator::addRow()
     for (int i = 0; i < m_columnCount; i++) {
         QModelIndex index = m_tableWidget->model()->index(0, i);
         m_tableWidget->model()->setData(index,
-            ((float)i / (float)m_columnCount) / 2.0f + (float)(rand() % 30) / 100.0f);
+            ((float)i / (float)m_columnCount) / 2.0f +
+                                        (float)(QRandomGenerator::bounded(30)) / 100.0f);
     }
     m_tableWidget->resizeColumnsToContents();
 }
diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp
index 4a9aaddb..cb82c672 100644
--- a/examples/datavisualization/qmloscilloscope/datasource.cpp
+++ b/examples/datavisualization/qmloscilloscope/datasource.cpp
@@ -29,6 +29,7 @@
 
 #include "datasource.h"
 #include <QtCore/qmath.h>
+#include <QtCore/qrandom.h>
 
 using namespace QtDataVisualization;
 
@@ -95,7 +96,7 @@ void DataSource::generateData(int cacheCount, int rowCount, int columnCount,
                 float colWave = float(qSin((2.0 * M_PI * colMod) - (1.0 / 2.0 * M_PI)) + 1.0);
                 float y = (colWave * ((float(qSin(rowColWaveAngleMul * colMod) + 1.0))))
                         * rowColWaveMul
-                        + (0.15f * float(qrand()) / float(RAND_MAX)) * yRangeMod;
+                        + QRandomGenerator::bounded(0.15f) * yRangeMod;
 
                 int index = k + cacheIndexAdjustment;
                 if (index >= columnCount) {
diff --git a/examples/datavisualization/scatter/scatterdatamodifier.cpp b/examples/datavisualization/scatter/scatterdatamodifier.cpp
index efb859a9..025a6fa5 100644
--- a/examples/datavisualization/scatter/scatterdatamodifier.cpp
+++ b/examples/datavisualization/scatter/scatterdatamodifier.cpp
@@ -35,6 +35,7 @@
 #include <QtDataVisualization/qscatter3dseries.h>
 #include <QtDataVisualization/q3dtheme.h>
 #include <QtCore/qmath.h>
+#include <QtCore/qrandom.h>
 #include <QtWidgets/QComboBox>
 
 using namespace QtDataVisualization;
@@ -208,7 +209,10 @@ void ScatterDataModifier::toggleItemCount()
 QVector3D ScatterDataModifier::randVector()
 {
     return QVector3D(
-                (float)(rand() % 100) / 2.0f - (float)(rand() % 100) / 2.0f,
-                (float)(rand() % 100) / 100.0f - (float)(rand() % 100) / 100.0f,
-                (float)(rand() % 100) / 2.0f - (float)(rand() % 100) / 2.0f);
+                (float)(QRandomGenerator::bounded(100)) / 2.0f -
+                (float)(QRandomGenerator::bounded(100)) / 2.0f,
+                (float)(QRandomGenerator::bounded(100)) / 100.0f -
+                (float)(QRandomGenerator::bounded(100)) / 100.0f,
+                (float)(QRandomGenerator::bounded(100)) / 2.0f -
+                (float)(QRandomGenerator::bounded(100)) / 2.0f);
 }
-- 
cgit v1.2.3