diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 16:39:49 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-22 11:14:54 +0200 |
| commit | 354d59cd8e7972525e5978d970ef5e64edb14898 (patch) | |
| tree | bf795efd936e0c2bec32d77310855b030775bd6d | |
| parent | 1da76e21a0a39295c4ff41f8f268dc0eb854a482 (diff) | |
| download | qtlocation-354d59cd8e7972525e5978d970ef5e64edb14898.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.
Pick-to: 5.15
Change-Id: Ie79c181e5f194c00949bfd7d2372f2d246b53180
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -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; |