summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-07-10 10:55:03 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-07-10 09:23:02 +0000
commitabcb5d1bccbc5913b7d994e0ad2685d484c35740 (patch)
tree78bce775e12732c3f8ecafe641235d008faac824
parentb0c601ae487575bbed28ed0590aafe69682b28c8 (diff)
downloadqtlocation-abcb5d1bccbc5913b7d994e0ad2685d484c35740.tar.gz
QGeoMapObject: Fix MSVC warnings about '*/' found outside of comment
labs\qsg\qmappolylineobjectqsg.cpp(103): warning C4138: '*/' found outside of comment labs\qsg\qmappolygonobjectqsg.cpp(81): warning C4138: '*/' found outside of comment labs\qsg\qqsgmapobject.cpp(53): warning C4138: '*/' found outside of comment Change-Id: I5c000dbd40e59af6504b52303bd4ae4a1b782dc9 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
-rw-r--r--src/location/labs/qsg/qmappolygonobjectqsg.cpp2
-rw-r--r--src/location/labs/qsg/qmappolylineobjectqsg.cpp2
-rw-r--r--src/location/labs/qsg/qqsgmapobject.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/location/labs/qsg/qmappolygonobjectqsg.cpp b/src/location/labs/qsg/qmappolygonobjectqsg.cpp
index 239df177..99a84ec5 100644
--- a/src/location/labs/qsg/qmappolygonobjectqsg.cpp
+++ b/src/location/labs/qsg/qmappolygonobjectqsg.cpp
@@ -78,7 +78,7 @@ QList<QDoubleVector2D> QMapPolygonObjectPrivateQSG::projectPath()
QSGNode *QMapPolygonObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode,
VisibleNode **visibleNode,
QSGNode *root,
- QQuickWindow */*window*/)
+ QQuickWindow * /*window*/)
{
Q_UNUSED(visibleNode)
MapPolygonNode *node = static_cast<MapPolygonNode *>(oldNode);
diff --git a/src/location/labs/qsg/qmappolylineobjectqsg.cpp b/src/location/labs/qsg/qmappolylineobjectqsg.cpp
index f4a1a288..5b184326 100644
--- a/src/location/labs/qsg/qmappolylineobjectqsg.cpp
+++ b/src/location/labs/qsg/qmappolylineobjectqsg.cpp
@@ -100,7 +100,7 @@ void QMapPolylineObjectPrivateQSG::updateGeometry()
QSGNode *QMapPolylineObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode,
VisibleNode **visibleNode,
QSGNode *root,
- QQuickWindow */*window*/)
+ QQuickWindow * /*window*/)
{
Q_UNUSED(visibleNode)
MapPolylineNode *node = static_cast<MapPolylineNode *>(oldNode);
diff --git a/src/location/labs/qsg/qqsgmapobject.cpp b/src/location/labs/qsg/qqsgmapobject.cpp
index ccda12d8..8c42dff2 100644
--- a/src/location/labs/qsg/qqsgmapobject.cpp
+++ b/src/location/labs/qsg/qqsgmapobject.cpp
@@ -50,7 +50,7 @@ QQSGMapObject::~QQSGMapObject()
}
QSGNode *QQSGMapObject::updateMapObjectNode(QSGNode *oldNode,
- VisibleNode **/*visibleNode*/,
+ VisibleNode ** /*visibleNode*/,
QSGNode * /*root*/,
QQuickWindow * /*window*/)
{