Map item geometry do not need to be QObjects.

Change-Id: I078c9eb57ad5a2aa70fde8900ec46958aa1882e1
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

10 files changed, 13 insertions, 33 deletions

diff --git a/src/imports/location/qdeclarativecirclemapitem.cpp b/src/imports/location/qdeclarativecirclemapitem.cpp
index f26995b3..a76039ed 100644
--- a/src/imports/location/qdeclarativecirclemapitem.cpp
+++ b/src/imports/location/qdeclarativecirclemapitem.cpp
@@ -136,8 +136,7 @@ struct Vertex
     QVector2D position;
 };
 
-QGeoMapCircleGeometry::QGeoMapCircleGeometry(QObject *parent) :
-    QGeoMapPolygonGeometry(parent)
+QGeoMapCircleGeometry::QGeoMapCircleGeometry()
 {
 }
 
diff --git a/src/imports/location/qdeclarativecirclemapitem_p.h b/src/imports/location/qdeclarativecirclemapitem_p.h
index e09e0ea4..a1f62b0c 100644
--- a/src/imports/location/qdeclarativecirclemapitem_p.h
+++ b/src/imports/location/qdeclarativecirclemapitem_p.h
@@ -54,14 +54,10 @@ class QDeclarativeGeoMapQuickItem;
 
 class QGeoMapCircleGeometry : public QGeoMapPolygonGeometry
 {
-    Q_OBJECT
-
 public:
-    explicit QGeoMapCircleGeometry(QObject *parent = 0);
+    QGeoMapCircleGeometry();
 
     void updateScreenPointsInvert(const QGeoMap &map);
-
-
 };
 
 class QDeclarativeCircleMapItem : public QDeclarativeGeoMapItemBase
diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp
index 1bd7fd10..48346abf 100644
--- a/src/imports/location/qdeclarativepolygonmapitem.cpp
+++ b/src/imports/location/qdeclarativepolygonmapitem.cpp
@@ -145,8 +145,8 @@ struct Vertex
     QVector2D position;
 };
 
-QGeoMapPolygonGeometry::QGeoMapPolygonGeometry(QObject *parent) :
-    QGeoMapItemGeometry(parent), assumeSimple_(false)
+QGeoMapPolygonGeometry::QGeoMapPolygonGeometry()
+:   assumeSimple_(false)
 {
 }
 
diff --git a/src/imports/location/qdeclarativepolygonmapitem_p.h b/src/imports/location/qdeclarativepolygonmapitem_p.h
index e96dd2cf..148b4cdf 100644
--- a/src/imports/location/qdeclarativepolygonmapitem_p.h
+++ b/src/imports/location/qdeclarativepolygonmapitem_p.h
@@ -56,10 +56,8 @@ class MapPolygonNode;
 
 class QGeoMapPolygonGeometry : public QGeoMapItemGeometry
 {
-    Q_OBJECT
-
 public:
-    explicit QGeoMapPolygonGeometry(QObject *parent = 0);
+    QGeoMapPolygonGeometry();
 
     inline void setAssumeSimple(bool value) { assumeSimple_ = value; }
 
diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp
index 83ed76b5..7cec7a58 100644
--- a/src/imports/location/qdeclarativepolylinemapitem.cpp
+++ b/src/imports/location/qdeclarativepolylinemapitem.cpp
@@ -180,8 +180,7 @@ struct Vertex
     QVector2D position;
 };
 
-QGeoMapPolylineGeometry::QGeoMapPolylineGeometry(QObject *parent) :
-    QGeoMapItemGeometry(parent)
+QGeoMapPolylineGeometry::QGeoMapPolylineGeometry()
 {
 }
 
diff --git a/src/imports/location/qdeclarativepolylinemapitem_p.h b/src/imports/location/qdeclarativepolylinemapitem_p.h
index 18f85b09..e013e6ca 100644
--- a/src/imports/location/qdeclarativepolylinemapitem_p.h
+++ b/src/imports/location/qdeclarativepolylinemapitem_p.h
@@ -81,10 +81,8 @@ private:
 
 class QGeoMapPolylineGeometry : public QGeoMapItemGeometry
 {
-    Q_OBJECT
-
 public:
-    explicit QGeoMapPolylineGeometry(QObject *parent = 0);
+    QGeoMapPolylineGeometry();
 
     void updateSourcePoints(const QGeoMap &map,
                             const QList<QGeoCoordinate> &path);
diff --git a/src/imports/location/qdeclarativerectanglemapitem.cpp b/src/imports/location/qdeclarativerectanglemapitem.cpp
index 54514ea5..8004a542 100644
--- a/src/imports/location/qdeclarativerectanglemapitem.cpp
+++ b/src/imports/location/qdeclarativerectanglemapitem.cpp
@@ -122,8 +122,7 @@ struct Vertex
     QVector2D position;
 };
 
-QGeoMapRectangleGeometry::QGeoMapRectangleGeometry(QObject *parent) :
-    QGeoMapItemGeometry(parent)
+QGeoMapRectangleGeometry::QGeoMapRectangleGeometry()
 {
 }
 
diff --git a/src/imports/location/qdeclarativerectanglemapitem_p.h b/src/imports/location/qdeclarativerectanglemapitem_p.h
index ead79f59..6adc8e31 100644
--- a/src/imports/location/qdeclarativerectanglemapitem_p.h
+++ b/src/imports/location/qdeclarativerectanglemapitem_p.h
@@ -52,10 +52,8 @@ QT_BEGIN_NAMESPACE
 
 class QGeoMapRectangleGeometry : public QGeoMapItemGeometry
 {
-    Q_OBJECT
-
 public:
-    explicit QGeoMapRectangleGeometry(QObject *parent = 0);
+    QGeoMapRectangleGeometry();
 
     void updatePoints(const QGeoMap &map,
                       const QGeoCoordinate &topLeft,
diff --git a/src/imports/location/qgeomapitemgeometry.cpp b/src/imports/location/qgeomapitemgeometry.cpp
index 528b084c..a8ba3eb6 100644
--- a/src/imports/location/qgeomapitemgeometry.cpp
+++ b/src/imports/location/qgeomapitemgeometry.cpp
@@ -47,12 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QGeoMapItemGeometry::QGeoMapItemGeometry(QObject *parent) :
-    QObject(parent),
-    sourceDirty_(true),
-    screenDirty_(true),
-    clipToViewport_(true),
-    preserveGeometry_(false)
+QGeoMapItemGeometry::QGeoMapItemGeometry()
+:   sourceDirty_(true), screenDirty_(true), clipToViewport_(true), preserveGeometry_(false)
 {
 }
 
diff --git a/src/imports/location/qgeomapitemgeometry_p.h b/src/imports/location/qgeomapitemgeometry_p.h
index ac568580..3e4a6247 100644
--- a/src/imports/location/qgeomapitemgeometry_p.h
+++ b/src/imports/location/qgeomapitemgeometry_p.h
@@ -43,7 +43,6 @@
 #define QGEOMAPITEMGEOMETRY_H
 
 #include <QPainterPath>
-#include <QPolygonF>
 #include <QPointF>
 #include <QRectF>
 #include <QVector>
@@ -56,10 +55,8 @@ QT_BEGIN_NAMESPACE
 class QSGGeometry;
 class QGeoMap;
 
-class QGeoMapItemGeometry : public QObject
+class QGeoMapItemGeometry
 {
-    Q_OBJECT
-
 public:
 
     struct Point
@@ -70,7 +67,7 @@ public:
         qreal x, y;
     };
 
-    explicit QGeoMapItemGeometry(QObject *parent = 0);
+    QGeoMapItemGeometry();
 
     inline bool isSourceDirty() const { return sourceDirty_; }
     inline bool isScreenDirty() const { return screenDirty_; }