4 files changed, 12 insertions, 12 deletions
diff --git a/tests/manual/galaxy/cumulativedistributor.cpp b/tests/manual/galaxy/cumulativedistributor.cpp
index b5d6f8c6..4506480c 100644
--- a/tests/manual/galaxy/cumulativedistributor.cpp
+++ b/tests/manual/galaxy/cumulativedistributor.cpp
@@ -37,6 +37,7 @@
 #include "cumulativedistributor.h"
 
 #include <QDebug>
+#include <math.h>
 
 CumulativeDistributor::CumulativeDistributor()
     : m_pDistFun(NULL),
diff --git a/tests/manual/galaxy/galaxy.pro b/tests/manual/galaxy/galaxy.pro
index 0b602e16..5c35b862 100644
--- a/tests/manual/galaxy/galaxy.pro
+++ b/tests/manual/galaxy/galaxy.pro
@@ -17,6 +17,7 @@ HEADERS += \
     star.h
 
 QT += widgets
+CONFIG += exceptions
 
 OTHER_FILES += doc/src/* \
                doc/images/*
diff --git a/tests/manual/galaxy/galaxydata.cpp b/tests/manual/galaxy/galaxydata.cpp
index 8a409132..c49e07fd 100644
--- a/tests/manual/galaxy/galaxydata.cpp
+++ b/tests/manual/galaxy/galaxydata.cpp
@@ -44,6 +44,7 @@
 #include <QtDataVisualization/qscatter3dseries.h>
 #include <QtDataVisualization/q3dtheme.h>
 #include <QtCore/qmath.h>
+#include <QtCore/qrandom.h>
 #include <QPainter>
 
 #include <QDebug>
@@ -53,7 +54,6 @@ using namespace QtDataVisualization;
 static const int numOfStars = 70000;
 static const int numOfDust = numOfStars / 2;
 static const int numOfH2 = 200;
-static const qreal rand_max = qreal(RAND_MAX);
 
 GalaxyData::GalaxyData(Q3DScatter *scatter,
                        qreal rad,
@@ -163,12 +163,12 @@ void GalaxyData::createGalaxy()
                       1000.0);           // Anzahl der stützstellen
 
     for (int i = 3; i < numOfStars; ++i) {
-        qreal rad = cd.valFromProp(qreal(qrand()) / rand_max);
+        qreal rad = cd.valFromProp(QRandomGenerator::global()->generateDouble());
 
         m_pStars[i].m_a = rad;
         m_pStars[i].m_b = rad * getExcentricity(rad);
         m_pStars[i].m_angle = getAngularOffset(rad);
-        m_pStars[i].m_theta = 360.0 * ((double)rand() / RAND_MAX);
+        m_pStars[i].m_theta = 360.0 * QRandomGenerator::global()->generateDouble();
         m_pStars[i].m_center = QVector2D(0.0f, 0.0f);
         m_pStars[i].calcXY();
 
@@ -179,14 +179,14 @@ void GalaxyData::createGalaxy()
     qreal x, y, rad;
     for (int i = 0; i < numOfDust; ++i)
     {
-        x = 2.0 * m_radGalaxy * ((double)rand() / RAND_MAX) - m_radGalaxy;
-        y = 2.0 * m_radGalaxy * ((double)rand() / RAND_MAX) - m_radGalaxy;
+        x = 2.0 * m_radGalaxy * QRandomGenerator::global()->generateDouble() - m_radGalaxy;
+        y = 2.0 * m_radGalaxy * QRandomGenerator::global()->generateDouble() - m_radGalaxy;
         rad = sqrt(x*x + y*y);
 
         m_pDust[i].m_a = rad;
         m_pDust[i].m_b = rad * getExcentricity(rad);
         m_pDust[i].m_angle = getAngularOffset(rad);
-        m_pDust[i].m_theta = 360.0 * ((double)rand() / RAND_MAX);
+        m_pDust[i].m_theta = 360.0 * QRandomGenerator::global()->generateDouble();
         m_pDust[i].m_center = QVector2D(0.0f, 0.0f);
         m_pDust[i].calcXY();
 
@@ -196,15 +196,15 @@ void GalaxyData::createGalaxy()
     // Initialize H2
     for (int i = 0; i < numOfH2; ++i)
     {
-        x = 2*(m_radGalaxy) * ((double)rand() / RAND_MAX) - (m_radGalaxy);
-        y = 2*(m_radGalaxy) * ((double)rand() / RAND_MAX) - (m_radGalaxy);
+        x = 2*(m_radGalaxy) * QRandomGenerator::global()->generateDouble() - (m_radGalaxy);
+        y = 2*(m_radGalaxy) * QRandomGenerator::global()->generateDouble() - (m_radGalaxy);
         rad = sqrt(x*x + y*y);
 
         int k1 = 2*i;
         m_pH2[k1].m_a = rad;
         m_pH2[k1].m_b = rad * getExcentricity(rad);
         m_pH2[k1].m_angle = getAngularOffset(rad);
-        m_pH2[k1].m_theta = 360.0 * ((double)rand() / RAND_MAX);
+        m_pH2[k1].m_theta = 360.0 * QRandomGenerator::global()->generateDouble();
         m_pH2[k1].m_center = QVector2D(0.0f, 0.0f);
         m_pH2[k1].calcXY();
 
diff --git a/tests/manual/galaxy/star.cpp b/tests/manual/galaxy/star.cpp
index 1513c93b..ca6b66f0 100644
--- a/tests/manual/galaxy/star.cpp
+++ b/tests/manual/galaxy/star.cpp
@@ -31,8 +31,6 @@
 
 #include <QtCore/qmath.h>
 
-static const double DEG_TO_RAD = M_PI / 180.0;
-
 Star::Star()
     : m_theta(0),
       m_a(0),
@@ -49,7 +47,7 @@ const void Star::calcXY()
     const QVector2D &p = m_center;
 
     qreal beta  = -m_angle;
-    qreal alpha = theta * DEG_TO_RAD;
+    qreal alpha = qDegreesToRadians(theta);
 
     // temporaries to save cpu time
     qreal cosalpha = qCos(alpha);