Fix errors reported by coverity.

Uninitialised member variables.

Hidden memeber function.  The QQuickItem::contains() viritual function
was was added recently.  QDeclarativeGeoMapItemBase already had a
similar function with a slightly different signature.  Remove the
QDeclarativeGeoMapItemBase function and changed the signature of the
other map item classes to override the QQuickItem one.

Change-Id: I70853184ca78465742231d1aa9c941e3088cc0f6
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>

15 files changed, 16 insertions, 26 deletions

diff --git a/src/imports/location/qdeclarativecirclemapitem.cpp b/src/imports/location/qdeclarativecirclemapitem.cpp
index 8f9ad95d..b48e42de 100644
--- a/src/imports/location/qdeclarativecirclemapitem.cpp
+++ b/src/imports/location/qdeclarativecirclemapitem.cpp
@@ -441,7 +441,7 @@ void QDeclarativeCircleMapItem::dragEnded()
 /*!
     \internal
 */
-bool QDeclarativeCircleMapItem::contains(const QPointF &point)
+bool QDeclarativeCircleMapItem::contains(const QPointF &point) const
 {
     return (geometry_.contains(point) || borderGeometry_.contains(point));
 }
diff --git a/src/imports/location/qdeclarativecirclemapitem_p.h b/src/imports/location/qdeclarativecirclemapitem_p.h
index 9ace8428..5b8cdd93 100644
--- a/src/imports/location/qdeclarativecirclemapitem_p.h
+++ b/src/imports/location/qdeclarativecirclemapitem_p.h
@@ -80,7 +80,7 @@ public:
 
     void dragStarted();
     void dragEnded();
-    bool contains(const QPointF &point);
+    bool contains(const QPointF &point) const;
 
 Q_SIGNALS:
     void centerChanged(const QDeclarativeCoordinate *center);
diff --git a/src/imports/location/qdeclarativegeomapitembase.cpp b/src/imports/location/qdeclarativegeomapitembase.cpp
index 53dc8e37..4fe36457 100644
--- a/src/imports/location/qdeclarativegeomapitembase.cpp
+++ b/src/imports/location/qdeclarativegeomapitembase.cpp
@@ -121,15 +121,6 @@ void QDeclarativeGeoMapItemBase::afterChildrenChanged()
 /*!
     \internal
 */
-bool QDeclarativeGeoMapItemBase::contains(const QPointF &point)
-{
-    Q_UNUSED(point);
-    return true;
-}
-
-/*!
-    \internal
-*/
 void QDeclarativeGeoMapItemBase::dragStarted()
 {
 }
diff --git a/src/imports/location/qdeclarativegeomapitembase_p.h b/src/imports/location/qdeclarativegeomapitembase_p.h
index f996aabb..6de04038 100644
--- a/src/imports/location/qdeclarativegeomapitembase_p.h
+++ b/src/imports/location/qdeclarativegeomapitembase_p.h
@@ -76,7 +76,6 @@ public:
 
     virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map);
     virtual void setPositionOnMap(const QGeoCoordinate &coordinate, const QPointF &offset);
-    virtual bool contains(const QPointF &point);
     virtual void dragStarted();
     virtual void dragEnded();
 
diff --git a/src/imports/location/qdeclarativegeomapmousearea.cpp b/src/imports/location/qdeclarativegeomapmousearea.cpp
index 8dffd62a..30e11d11 100644
--- a/src/imports/location/qdeclarativegeomapmousearea.cpp
+++ b/src/imports/location/qdeclarativegeomapmousearea.cpp
@@ -203,7 +203,7 @@ void QDeclarativeGeoMapMouseArea::mousePressEvent(QMouseEvent *event)
     // ignore event if it misses non-rectangular geometry (e.g. circle, route)
     bool contains = true;
     if (pmi && qobject_cast<QDeclarativeGeoMapItemBase *>(pmi))
-         contains = qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)->contains(event->pos());
+        contains = pmi->contains(event->pos());
 
     if (contains)
         QQuickMouseArea::mousePressEvent(event);
@@ -260,7 +260,7 @@ void QDeclarativeGeoMapMouseArea::hoverEnterEvent(QHoverEvent *event)
     QQuickItem *pmi = parentMapItem();
     bool contains = true;
     if (pmi && qobject_cast<QDeclarativeGeoMapItemBase *>(pmi))
-         contains = qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)->contains(event->pos());
+         contains = pmi->contains(event->pos());
 
     /* for many objects it's doubtful this will ever be true */
     if (!hovered() && contains)
@@ -277,7 +277,7 @@ void QDeclarativeGeoMapMouseArea::hoverMoveEvent(QHoverEvent *event)
     QQuickItem *pmi = parentMapItem();
     bool contains = true;
     if (pmi && qobject_cast<QDeclarativeGeoMapItemBase *>(pmi))
-         contains = qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)->contains(event->pos());
+         contains = pmi->contains(event->pos());
 
     /* we may have already entered the object from scenegraph's perspective
      * (ie, the hoverEnterEvent fired and we ignored it), so make sure our
@@ -300,7 +300,7 @@ void QDeclarativeGeoMapMouseArea::hoverLeaveEvent(QHoverEvent *event)
     QQuickItem *pmi = parentMapItem();
     bool contains = true;
     if (pmi && qobject_cast<QDeclarativeGeoMapItemBase *>(pmi))
-         contains = qobject_cast<QDeclarativeGeoMapItemBase *>(pmi)->contains(event->pos());
+         contains = pmi->contains(event->pos());
 
     if (!hovered() && contains)
         QQuickMouseArea::hoverEnterEvent(event);
diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp
index 79d3c589..269d5533 100644
--- a/src/imports/location/qdeclarativepolygonmapitem.cpp
+++ b/src/imports/location/qdeclarativepolygonmapitem.cpp
@@ -575,7 +575,7 @@ void QDeclarativePolygonMapItem::afterViewportChanged(const QGeoMapViewportChang
 /*!
     \internal
 */
-bool QDeclarativePolygonMapItem::contains(const QPointF &point)
+bool QDeclarativePolygonMapItem::contains(const QPointF &point) const
 {
     return (geometry_.contains(point) || borderGeometry_.contains(point));
 }
diff --git a/src/imports/location/qdeclarativepolygonmapitem_p.h b/src/imports/location/qdeclarativepolygonmapitem_p.h
index bf9aedbf..8ed8961d 100644
--- a/src/imports/location/qdeclarativepolygonmapitem_p.h
+++ b/src/imports/location/qdeclarativepolygonmapitem_p.h
@@ -97,7 +97,7 @@ public:
 
     QDeclarativeMapLineProperties *border();
 
-    bool contains(const QPointF &point);
+    bool contains(const QPointF &point) const;
     void dragStarted();
     void dragEnded();
 
diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp
index af86a0c7..5686bf40 100644
--- a/src/imports/location/qdeclarativepolylinemapitem.cpp
+++ b/src/imports/location/qdeclarativepolylinemapitem.cpp
@@ -682,7 +682,7 @@ QSGNode *QDeclarativePolylineMapItem::updateMapItemPaintNode(QSGNode *oldNode, U
     return node;
 }
 
-bool QDeclarativePolylineMapItem::contains(const QPointF &point)
+bool QDeclarativePolylineMapItem::contains(const QPointF &point) const
 {
     return geometry_.contains(point);
 }
diff --git a/src/imports/location/qdeclarativepolylinemapitem_p.h b/src/imports/location/qdeclarativepolylinemapitem_p.h
index 821e8b01..04ddaea3 100644
--- a/src/imports/location/qdeclarativepolylinemapitem_p.h
+++ b/src/imports/location/qdeclarativepolylinemapitem_p.h
@@ -114,7 +114,7 @@ public:
 
     QQmlListProperty<QDeclarativeCoordinate> declarativePath();
 
-    bool contains(const QPointF &point);
+    bool contains(const QPointF &point) const;
 
     QDeclarativeMapLineProperties *line();
 
diff --git a/src/imports/location/qdeclarativerectanglemapitem.cpp b/src/imports/location/qdeclarativerectanglemapitem.cpp
index 259038e3..76c86808 100644
--- a/src/imports/location/qdeclarativerectanglemapitem.cpp
+++ b/src/imports/location/qdeclarativerectanglemapitem.cpp
@@ -403,7 +403,7 @@ void QDeclarativeRectangleMapItem::afterViewportChanged(const QGeoMapViewportCha
 /*!
     \internal
 */
-bool QDeclarativeRectangleMapItem::contains(const QPointF &point)
+bool QDeclarativeRectangleMapItem::contains(const QPointF &point) const
 {
     return (geometry_.contains(point) || borderGeometry_.contains(point));
 }
diff --git a/src/imports/location/qdeclarativerectanglemapitem_p.h b/src/imports/location/qdeclarativerectanglemapitem_p.h
index f45d2bae..7d5e4d62 100644
--- a/src/imports/location/qdeclarativerectanglemapitem_p.h
+++ b/src/imports/location/qdeclarativerectanglemapitem_p.h
@@ -94,7 +94,7 @@ public:
 
     void dragStarted();
     void dragEnded();
-    bool contains(const QPointF &point);
+    bool contains(const QPointF &point) const;
 
 Q_SIGNALS:
     void topLeftChanged(const QDeclarativeCoordinate *topLeft);
diff --git a/src/imports/location/qdeclarativeroutemapitem.cpp b/src/imports/location/qdeclarativeroutemapitem.cpp
index a1ef03d6..7e392590 100644
--- a/src/imports/location/qdeclarativeroutemapitem.cpp
+++ b/src/imports/location/qdeclarativeroutemapitem.cpp
@@ -234,7 +234,7 @@ void QDeclarativeRouteMapItem::afterViewportChanged(const QGeoMapViewportChangeE
 /*!
     \internal
 */
-bool QDeclarativeRouteMapItem::contains(const QPointF &point)
+bool QDeclarativeRouteMapItem::contains(const QPointF &point) const
 {
     return geometry_.contains(point);
 }
diff --git a/src/imports/location/qdeclarativeroutemapitem_p.h b/src/imports/location/qdeclarativeroutemapitem_p.h
index 64522306..6679eafd 100644
--- a/src/imports/location/qdeclarativeroutemapitem_p.h
+++ b/src/imports/location/qdeclarativeroutemapitem_p.h
@@ -73,7 +73,7 @@ public:
 
     QDeclarativeMapLineProperties *line();
 
-    bool contains(const QPointF &point);
+    bool contains(const QPointF &point) const;
 
 Q_SIGNALS:
     void routeChanged(const QDeclarativeGeoRoute *route);
diff --git a/src/imports/location/qgeomapitemgeometry.cpp b/src/imports/location/qgeomapitemgeometry.cpp
index ba372536..fec9f33a 100644
--- a/src/imports/location/qgeomapitemgeometry.cpp
+++ b/src/imports/location/qgeomapitemgeometry.cpp
@@ -47,7 +47,8 @@ QT_BEGIN_NAMESPACE
 QGeoMapItemGeometry::QGeoMapItemGeometry(QObject *parent) :
     QObject(parent),
     sourceDirty_(true),
-    screenDirty_(true)
+    screenDirty_(true),
+    clipToViewport_(true)
 {
 }
 
diff --git a/src/location/maps/qgeotilerequestmanager.cpp b/src/location/maps/qgeotilerequestmanager.cpp
index 431a3c26..bcce4a22 100644
--- a/src/location/maps/qgeotilerequestmanager.cpp
+++ b/src/location/maps/qgeotilerequestmanager.cpp
@@ -58,7 +58,6 @@ public:
     ~QGeoTileRequestManagerPrivate();
 
     QGeoTiledMapData *map_;
-    QGeoTileCache *cache_;
 
     QList<QSharedPointer<QGeoTileTexture> > requestTiles(const QSet<QGeoTileSpec> &tiles);
     void tileError(const QGeoTileSpec &tile, const QString &errorString);