From 279fe7bff763f3ebabed6a8e1f5f60ca473cf497 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 26 Jun 2018 16:24:07 +0300 Subject: [PATCH] Cppcheck warning 'qrandCalled'. --HG-- branch : develop --- src/libs/qmuparser/qmuparsertest.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/libs/qmuparser/qmuparsertest.h b/src/libs/qmuparser/qmuparsertest.h index b6e3279d4..4b1442c8e 100644 --- a/src/libs/qmuparser/qmuparsertest.h +++ b/src/libs/qmuparser/qmuparsertest.h @@ -30,6 +30,10 @@ #include #include +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +# include +#endif + #include "../qmuparser/qmuparser_global.h" #include "qmuparser.h" #include "qmuparser_global.h" @@ -234,12 +238,22 @@ private: static qreal Rnd ( qreal v ) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + return static_cast( ( 1 + ( v * QRandomGenerator().bounded(RAND_MAX); / ( RAND_MAX + 1.0 ) ) ) ); +#else + // cppcheck-suppress qrandCalled return static_cast( ( 1 + ( v * qrand() / ( RAND_MAX + 1.0 ) ) ) ); +#endif } static qreal RndWithString ( const char_type* ) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + return static_cast( ( 1 + ( 1000.0f * QRandomGenerator().bounded(RAND_MAX) / ( RAND_MAX + 1.0 ) ) ) ); +#else + // cppcheck-suppress qrandCalled return static_cast( ( 1 + ( 1000.0f * static_cast(qrand()) / ( RAND_MAX + 1.0 ) ) ) ); +#endif } static qreal Ping()