t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace qrand/qsrand with QRandomGenerator (qt6)

Browse Source 
Since Qt5, qrand/qsrand methods [are deprecated](https://doc.qt.io/qt-5/qtglobal-obsolete.html#qrand).

Qt6 remove those methods, thus we need to use instead a [QRandomGenerator](https://doc.qt.io/qt-6/qrandomgenerator.html).

QElapsedTimer is available since Qt5.10, and is already used in the source code.
This commit is contained in:
Ludovic LANGE
2022-09-24 17:34:40 +02:00
parent a3bd67ea99
commit 07db287407
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scriptingwindow.cpp
+10 -1
View File
@@ -4,6 +4,9 @@
#include <QFile> #include <QFile>
#include <QFileDialog> #include <QFileDialog>
#include <QSettings> #include <QSettings>
#if QT_VERSION >= QT_VERSION_CHECK( 5, 10, 0 )
#include <QtCore/QRandomGenerator>
#endif
#include "connections/canconmanager.h" #include "connections/canconmanager.h"
#include "helpwindow.h" #include "helpwindow.h"
@@ -234,7 +237,13 @@ void ScriptingWindow::createNewScript()
container = new ScriptContainer(); container = new ScriptContainer();
container->fileName = "UNNAMED_" + QString::number((qrand() % 10000)) + ".js"; QString randomPart;
#if QT_VERSION < QT_VERSION_CHECK( 5, 10, 0 )
randomPart = QString::number((qrand() % 10000));
#else
randomPart = QString::number((QRandomGenerator::global()->bounded(10000)));
#endif
container->fileName = "UNNAMED_" + randomPart + ".js";
container->filePath = QString(); container->filePath = QString();
container->scriptText = QString(); container->scriptText = QString();
container->setScriptWindow(this); container->setScriptWindow(this);
simplecrypt.cpp
+12
View File
@@ -31,6 +31,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QDateTime> #include <QDateTime>
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QDataStream> #include <QDataStream>
#include <QIODevice>
#if QT_VERSION >= QT_VERSION_CHECK( 5, 10, 0 )
#include <QtCore/QRandomGenerator>
#endif
SimpleCrypt::SimpleCrypt(): SimpleCrypt::SimpleCrypt():
m_key(0), m_key(0),
@@ -38,7 +42,9 @@ SimpleCrypt::SimpleCrypt():
m_protectionMode(ProtectionChecksum), m_protectionMode(ProtectionChecksum),
m_lastError(ErrorNoError) m_lastError(ErrorNoError)
{ {
#if QT_VERSION < QT_VERSION_CHECK( 5, 10, 0 )
qsrand(uint(QDateTime::currentMSecsSinceEpoch() & 0xFFFF)); qsrand(uint(QDateTime::currentMSecsSinceEpoch() & 0xFFFF));
#endif
} }
SimpleCrypt::SimpleCrypt(quint64 key): SimpleCrypt::SimpleCrypt(quint64 key):
@@ -47,7 +53,9 @@ SimpleCrypt::SimpleCrypt(quint64 key):
m_protectionMode(ProtectionChecksum), m_protectionMode(ProtectionChecksum),
m_lastError(ErrorNoError) m_lastError(ErrorNoError)
{ {
#if QT_VERSION < QT_VERSION_CHECK( 5, 10, 0 )
qsrand(uint(QDateTime::currentMSecsSinceEpoch() & 0xFFFF)); qsrand(uint(QDateTime::currentMSecsSinceEpoch() & 0xFFFF));
#endif
splitKey(); splitKey();
} }
@@ -113,7 +121,11 @@ QByteArray SimpleCrypt::encryptToByteArray(QByteArray plaintext)
} }
//prepend a random char to the string //prepend a random char to the string
#if QT_VERSION < QT_VERSION_CHECK( 5, 10, 0 )
char randomChar = char(qrand() & 0xFF); char randomChar = char(qrand() & 0xFF);
#else
char randomChar = char(QRandomGenerator::global()->bounded(256));
#endif
ba = randomChar + integrityProtection + ba; ba = randomChar + integrityProtection + ba;
int pos(0); int pos(0);