From 354d59cd8e7972525e5978d970ef5e64edb14898 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 20 Jul 2020 16:39:49 +0200 Subject: Purge uses of legacy cruft before qtbase removes it A use of deprecated qrand() was in a comment, so remove it. A use of QT_BEGIN_HEADER wasn't matched by QT_END_HEADER and it's now a no-op anyway. Pick-to: 5.15 Change-Id: Ie79c181e5f194c00949bfd7d2372f2d246b53180 Reviewed-by: Alex Blasche --- src/plugins/position/corelocation/qgeopositioninfosource_cl_p.h | 2 -- tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp | 1 - 2 files changed, 3 deletions(-) diff --git a/src/plugins/position/corelocation/qgeopositioninfosource_cl_p.h b/src/plugins/position/corelocation/qgeopositioninfosource_cl_p.h index cfd66bf9..5ede8bf6 100644 --- a/src/plugins/position/corelocation/qgeopositioninfosource_cl_p.h +++ b/src/plugins/position/corelocation/qgeopositioninfosource_cl_p.h @@ -56,8 +56,6 @@ #include "qgeopositioninfosource.h" #include "qgeopositioninfo.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QGeoPositionInfoSourceCL : public QGeoPositionInfoSource diff --git a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp index 939225a7..e91cfc30 100644 --- a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp +++ b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp @@ -60,7 +60,6 @@ void QDeclarativeLocationTestModel::timerFired() //qDebug() << "timer fired" ; repopulate(); if (crazyMode_) { - //qDebug() << "raw randomw value: " << qrand(); int delay = (QRandomGenerator::global()->bounded(uint(INT_MAX) + 1) % crazyLevel_); // writing software is exact science delay = qMax(1000, delay); // 3 ms at minimum qDebug() << "starting timer with : " << delay; -- cgit v1.2.1