From 1da76e21a0a39295c4ff41f8f268dc0eb854a482 Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Sat, 27 Jun 2020 12:54:03 +0200 Subject: Add ; to Q_UNUSED This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I1aaf36e893b8f947abd0770acd9d3007cffdcb10 Reviewed-by: Alex Blasche --- src/imports/locationlabs/locationlabs.cpp | 4 ++-- src/location/declarativemaps/qdeclarativepolylinemapitem.cpp | 2 +- src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h | 2 +- src/location/declarativemaps/qparameterizableobject.cpp | 4 ++-- src/location/labs/qmapobjectview.cpp | 2 +- src/plugins/geoservices/esri/placesearchreply_esri.cpp | 2 +- src/plugins/position/corelocation/qgeopositioninfosource_cl.mm | 2 +- .../position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp | 2 +- tests/auto/positionplugin/plugin.cpp | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/imports/locationlabs/locationlabs.cpp b/src/imports/locationlabs/locationlabs.cpp index 708869d0..50fe760f 100644 --- a/src/imports/locationlabs/locationlabs.cpp +++ b/src/imports/locationlabs/locationlabs.cpp @@ -52,8 +52,8 @@ QT_BEGIN_NAMESPACE static QObject *singleton_type_factory(QQmlEngine *engine, QJSEngine *jsEngine) { - Q_UNUSED(engine) - Q_UNUSED(jsEngine) + Q_UNUSED(engine); + Q_UNUSED(jsEngine); return new LocationLabsSingleton; } diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp index 0448d667..183ef0de 100644 --- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp +++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp @@ -1686,7 +1686,7 @@ void QGeoMapPolylineGeometryOpenGL::allocateAndFillLineStrip(QSGGeometry *geom, int lod) const { // Select LOD. Generate if not present. Assign it to m_screenVertices; - Q_UNUSED(lod) + Q_UNUSED(lod); const QList &vx = *m_screenVertices; geom->allocate(vx.size()); diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h index 2cec8830..22a69173 100644 --- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h +++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h @@ -312,7 +312,7 @@ public: bool contains(const QPointF &point) const override { - Q_UNUSED(point) + Q_UNUSED(point); return false; } diff --git a/src/location/declarativemaps/qparameterizableobject.cpp b/src/location/declarativemaps/qparameterizableobject.cpp index 26d9a11e..25c535e0 100644 --- a/src/location/declarativemaps/qparameterizableobject.cpp +++ b/src/location/declarativemaps/qparameterizableobject.cpp @@ -111,8 +111,8 @@ QParameterizableObject::QParameterizableObject(QObject *parent) void QParameterizableObjectData::parentChanged(QAbstractDeclarativeData *d, QObject *o, QObject *p) { - Q_UNUSED(p) - Q_UNUSED(d) + Q_UNUSED(p); + Q_UNUSED(d); QParameterizableObject *po = qobject_cast(o); if (po) po->parentChanged(); diff --git a/src/location/labs/qmapobjectview.cpp b/src/location/labs/qmapobjectview.cpp index e0a6a294..a5143c54 100644 --- a/src/location/labs/qmapobjectview.cpp +++ b/src/location/labs/qmapobjectview.cpp @@ -379,7 +379,7 @@ void QMapObjectView::removeMapObjectFromMap(int index) if (releaseStatus == QQmlInstanceModel::Referenced) qWarning() << "object "<(sender()); reply->deleteLater(); setError(QPlaceReply::CommunicationError, reply->errorString()); diff --git a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm index 2d412138..8d9c6dab 100644 --- a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm +++ b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm @@ -63,7 +63,7 @@ } - (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status { - Q_UNUSED(manager) + Q_UNUSED(manager); if (status == kCLAuthorizationStatusNotDetermined) m_positionInfoSource->requestUpdate(MINIMUM_UPDATE_INTERVAL); } diff --git a/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp b/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp index d56f1d46..fca7ab40 100644 --- a/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp +++ b/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp @@ -264,6 +264,6 @@ QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactorySerialNmea::satelliteInfoS QGeoAreaMonitorSource *QGeoPositionInfoSourceFactorySerialNmea::areaMonitorWithParameters(QObject *parent, const QVariantMap ¶meters) { Q_UNUSED(parent); - Q_UNUSED(parameters) + Q_UNUSED(parameters); return nullptr; } diff --git a/tests/auto/positionplugin/plugin.cpp b/tests/auto/positionplugin/plugin.cpp index f28797b5..82bc4411 100644 --- a/tests/auto/positionplugin/plugin.cpp +++ b/tests/auto/positionplugin/plugin.cpp @@ -251,14 +251,14 @@ QGeoPositionInfoSource *QGeoPositionInfoSourceFactoryTest::positionInfoSourceWit QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactoryTest::satelliteInfoSourceWithParameters(QObject *parent, const QVariantMap ¶meters) { Q_UNUSED(parent); - Q_UNUSED(parameters) + Q_UNUSED(parameters); return nullptr; } QGeoAreaMonitorSource *QGeoPositionInfoSourceFactoryTest::areaMonitorWithParameters(QObject *parent, const QVariantMap ¶meters) { Q_UNUSED(parent); - Q_UNUSED(parameters) + Q_UNUSED(parameters); return nullptr; } -- cgit v1.2.1