Change almost all other uses of qrand() to QRandomGenerator

The vast majority is actually switched to QRandomGenerator::bounded(),
which gives a mostly uniform distribution over the [0, bound)
range. There are very few floating point cases left, as many of those
that did use floating point did not need to, after all. (I did leave
some that were too ugly for me to understand)

This commit also found a couple of calls to rand() instead of qrand().

This commit does not include changes to SSL code that continues to use
qrand() (job for someone else):
  src/network/ssl/qsslkey_qt.cpp
  src/network/ssl/qsslsocket_mac.cpp
  tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp

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

2 files changed, 24 insertions, 23 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 2abb6e3515..da15583d5d 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -32,6 +32,7 @@
 #include <private/qgraphicsitem_p.h>
 #include <private/qgraphicsview_p.h>
 #include <private/qgraphicsscene_p.h>
+#include <QRandomGenerator>
 #include <QStyleOptionGraphicsItem>
 #include <QAbstractTextDocumentLayout>
 #include <QBitmap>
@@ -3595,12 +3596,12 @@ void tst_QGraphicsItem::group()
     QList<QGraphicsItem *> newItems;
     for (int i = 0; i < 100; ++i) {
         QGraphicsItem *item = scene.addRect(QRectF(-25, -25, 50, 50), QPen(Qt::black, 0),
-                                            QBrush(QColor(rand() % 255, rand() % 255,
-                                                          rand() % 255, rand() % 255)));
+                                            QBrush(QColor(QRandomGenerator::global()->bounded(255), QRandomGenerator::global()->bounded(255),
+                                                          QRandomGenerator::global()->bounded(255), QRandomGenerator::global()->bounded(255))));
         newItems << item;
-        item->setPos(-1000 + rand() % 2000,
-                     -1000 + rand() % 2000);
-        item->setTransform(QTransform().rotate(rand() % 90), true);
+        item->setPos(-1000 + QRandomGenerator::global()->bounded(2000),
+                     -1000 + QRandomGenerator::global()->bounded(2000));
+        item->setTransform(QTransform().rotate(QRandomGenerator::global()->bounded(90)), true);
     }
 
     view.fitInView(scene.itemsBoundingRect());
@@ -4143,8 +4144,8 @@ void tst_QGraphicsItem::ensureVisible()
 
     for (int x = -100; x < 100; x += 25) {
         for (int y = -100; y < 100; y += 25) {
-            int xmargin = rand() % 75;
-            int ymargin = rand() % 75;
+            int xmargin = QRandomGenerator::global()->bounded(75);
+            int ymargin = QRandomGenerator::global()->bounded(75);
             item->ensureVisible(x, y, 25, 25, xmargin, ymargin);
             QApplication::processEvents();
 
@@ -7137,7 +7138,7 @@ public:
         : QGraphicsRectItem(QRectF(-10, -10, 20, 20))
     {
         setPen(QPen(Qt::black, 0));
-        setBrush(QColor(qrand() % 256, qrand() % 256, qrand() % 256));
+        setBrush(QColor(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256)));
     }
 
     QTransform x;
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 7615c5e821..968233438a 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -1507,10 +1507,10 @@ void tst_QGraphicsScene::mouseGrabberItem()
             QCOMPARE(scene.mouseGrabberItem(), topMostItem);
 
             // Geometrical changes should not affect the mouse grabber.
-            item->setZValue(rand() % 500);
-            item2->setZValue(rand() % 500);
-            item->setPos(rand() % 50000, rand() % 50000);
-            item2->setPos(rand() % 50000, rand() % 50000);
+            item->setZValue(QRandomGenerator::global()->bounded(500));
+            item2->setZValue(QRandomGenerator::global()->bounded(500));
+            item->setPos(QRandomGenerator::global()->bounded(50000), QRandomGenerator::global()->bounded(50000));
+            item2->setPos(QRandomGenerator::global()->bounded(50000), QRandomGenerator::global()->bounded(50000));
         }
 
         QGraphicsSceneMouseEvent releaseEvent(QEvent::GraphicsSceneMouseRelease);
@@ -3424,7 +3424,7 @@ void tst_QGraphicsScene::task139710_bspTreeCrash()
         // add 1000 more items - the BSP tree is now resized
         for (int i = 0; i < 1000; ++i) {
             QGraphicsRectItem *item = scene.addRect(QRectF(0, 0, 200, 200));
-            item->setPos(qrand() % 10000, qrand() % 10000);
+            item->setPos(QRandomGenerator::global()->bounded(10000), QRandomGenerator::global()->bounded(10000));
         }
 
         // trigger delayed item indexing for the first 1000 items
@@ -3433,7 +3433,7 @@ void tst_QGraphicsScene::task139710_bspTreeCrash()
         // add 1000 more items - the BSP tree is now resized
         for (int i = 0; i < 1000; ++i) {
             QGraphicsRectItem *item = scene.addRect(QRectF(0, 0, 200, 200));
-            item->setPos(qrand() % 10000, qrand() % 10000);
+            item->setPos(QRandomGenerator::global()->bounded(10000), QRandomGenerator::global()->bounded(10000));
         }
 
         // get items from the BSP tree and use them. there was junk in the tree
@@ -3543,15 +3543,15 @@ void tst_QGraphicsScene::sorting()
     QGraphicsRectItem *c_2_1 = new QGraphicsRectItem(0, 0, 30, 30, c_2);
     QGraphicsRectItem *c_2_1_1 = new QGraphicsRectItem(0, 0, 20, 20, c_2_1);
     QGraphicsRectItem *c_2_2 = new QGraphicsRectItem(0, 0, 30, 30, c_2);
-    t_1->setBrush(QColor(qrand() % 256, qrand() % 256, qrand() % 256));
-    c_1->setBrush(QColor(qrand() % 256, qrand() % 256, qrand() % 256));
-    c_1_1->setBrush(QColor(qrand() % 256, qrand() % 256, qrand() % 256));
-    c_1_1_1->setBrush(QColor(qrand() % 256, qrand() % 256, qrand() % 256));
-    c_1_2->setBrush(QColor(qrand() % 256, qrand() % 256, qrand() % 256));
-    c_2->setBrush(QColor(qrand() % 256, qrand() % 256, qrand() % 256));
-    c_2_1->setBrush(QColor(qrand() % 256, qrand() % 256, qrand() % 256));
-    c_2_1_1->setBrush(QColor(qrand() % 256, qrand() % 256, qrand() % 256));
-    c_2_2->setBrush(QColor(qrand() % 256, qrand() % 256, qrand() % 256));
+    t_1->setBrush(QColor(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256)));
+    c_1->setBrush(QColor(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256)));
+    c_1_1->setBrush(QColor(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256)));
+    c_1_1_1->setBrush(QColor(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256)));
+    c_1_2->setBrush(QColor(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256)));
+    c_2->setBrush(QColor(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256)));
+    c_2_1->setBrush(QColor(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256)));
+    c_2_1_1->setBrush(QColor(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256)));
+    c_2_2->setBrush(QColor(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256)));
 
     c_1->setPos(23, 18);
     c_1_1->setPos(24, 28);