diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 16:39:49 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-07-22 13:58:53 +0000 |
| commit | 9328401245165dd013af7b56d25f4e53f7c5456a (patch) | |
| tree | 66a0559694459b09df42c5cc70d5118f8f69f699 | |
| parent | e73246b0e575a14bd88a84f67543b7e9b50960d5 (diff) | |
| download | qtlocation-9328401245165dd013af7b56d25f4e53f7c5456a.tar.gz | |
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.
Change-Id: Ie79c181e5f194c00949bfd7d2372f2d246b53180
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 354d59cd8e7972525e5978d970ef5e64edb14898)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/position/corelocation/qgeopositioninfosource_cl_p.h | 2 | ||||
| -rw-r--r-- | tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp | 1 |
2 files changed, 0 insertions, 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; |