Disable copy and move for private, polymorph types

Change-Id: I373e324cbe96d0ae34cba62a105bea8a7fdb83dd
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

8 files changed, 27 insertions, 73 deletions

diff --git a/src/location/quickmapitems/qdeclarativecirclemapitem_p_p.h b/src/location/quickmapitems/qdeclarativecirclemapitem_p_p.h
index 319ff635..17ee2a96 100644
--- a/src/location/quickmapitems/qdeclarativecirclemapitem_p_p.h
+++ b/src/location/quickmapitems/qdeclarativecirclemapitem_p_p.h
@@ -68,14 +68,12 @@ public:
 
 class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItemPrivate
 {
+    Q_DISABLE_COPY_MOVE(QDeclarativeCircleMapItemPrivate)
 public:
     static const int CircleSamples = 128; // ToDo: make this radius && ZL dependent?
 
-    QDeclarativeCircleMapItemPrivate(QDeclarativeCircleMapItem &circle) : m_circle(circle)
-    {
-
-    }
-    QDeclarativeCircleMapItemPrivate(QDeclarativeCircleMapItemPrivate &other) : m_circle(other.m_circle)
+    QDeclarativeCircleMapItemPrivate(QDeclarativeCircleMapItem &circle)
+        : m_circle(circle)
     {
     }
 
@@ -122,12 +120,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItemPrivateCPU: public QDec
 {
 public:
 
-    QDeclarativeCircleMapItemPrivateCPU(QDeclarativeCircleMapItem &circle) : QDeclarativeCircleMapItemPrivate(circle)
-    {
-    }
-
-    QDeclarativeCircleMapItemPrivateCPU(QDeclarativeCircleMapItemPrivate &other)
-    : QDeclarativeCircleMapItemPrivate(other)
+    QDeclarativeCircleMapItemPrivateCPU(QDeclarativeCircleMapItem &circle)
+        : QDeclarativeCircleMapItemPrivate(circle)
     {
     }
 
diff --git a/src/location/quickmapitems/qdeclarativepolygonmapitem_p_p.h b/src/location/quickmapitems/qdeclarativepolygonmapitem_p_p.h
index 20871847..01ab40a2 100644
--- a/src/location/quickmapitems/qdeclarativepolygonmapitem_p_p.h
+++ b/src/location/quickmapitems/qdeclarativepolygonmapitem_p_p.h
@@ -103,12 +103,10 @@ private:
 
 class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivate
 {
+    Q_DISABLE_COPY_MOVE(QDeclarativePolygonMapItemPrivate)
 public:
-    QDeclarativePolygonMapItemPrivate(QDeclarativePolygonMapItem &polygon) : m_poly(polygon)
-    {
-
-    }
-    QDeclarativePolygonMapItemPrivate(QDeclarativePolygonMapItemPrivate &other) : m_poly(other.m_poly)
+    QDeclarativePolygonMapItemPrivate(QDeclarativePolygonMapItem &polygon)
+        : m_poly(polygon)
     {
     }
 
@@ -135,11 +133,6 @@ public:
     {
     }
 
-    QDeclarativePolygonMapItemPrivateCPU(QDeclarativePolygonMapItemPrivate &other)
-        : QDeclarativePolygonMapItemPrivate(other)
-    {
-    }
-
     ~QDeclarativePolygonMapItemPrivateCPU() override;
     void onLinePropertiesChanged() override
     {
diff --git a/src/location/quickmapitems/qdeclarativepolylinemapitem_p_p.h b/src/location/quickmapitems/qdeclarativepolylinemapitem_p_p.h
index 676e6f71..63243acf 100644
--- a/src/location/quickmapitems/qdeclarativepolylinemapitem_p_p.h
+++ b/src/location/quickmapitems/qdeclarativepolylinemapitem_p_p.h
@@ -142,12 +142,10 @@ protected:
 
 class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivate
 {
+    Q_DISABLE_COPY_MOVE(QDeclarativePolylineMapItemPrivate)
 public:
-    QDeclarativePolylineMapItemPrivate(QDeclarativePolylineMapItem &poly) : m_poly(poly)
-    {
-
-    }
-    QDeclarativePolylineMapItemPrivate(QDeclarativePolylineMapItemPrivate &other) : m_poly(other.m_poly)
+    QDeclarativePolylineMapItemPrivate(QDeclarativePolylineMapItem &poly)
+        : m_poly(poly)
     {
     }
 
@@ -169,12 +167,8 @@ public:
 class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivateCPU: public QDeclarativePolylineMapItemPrivate
 {
 public:
-    QDeclarativePolylineMapItemPrivateCPU(QDeclarativePolylineMapItem &poly) : QDeclarativePolylineMapItemPrivate(poly)
-    {
-    }
-
-    QDeclarativePolylineMapItemPrivateCPU(QDeclarativePolylineMapItemPrivate &other)
-    : QDeclarativePolylineMapItemPrivate(other)
+    QDeclarativePolylineMapItemPrivateCPU(QDeclarativePolylineMapItem &poly)
+        : QDeclarativePolylineMapItemPrivate(poly)
     {
     }
 
diff --git a/src/location/quickmapitems/qdeclarativerectanglemapitem_p_p.h b/src/location/quickmapitems/qdeclarativerectanglemapitem_p_p.h
index 4f76d445..93cce57d 100644
--- a/src/location/quickmapitems/qdeclarativerectanglemapitem_p_p.h
+++ b/src/location/quickmapitems/qdeclarativerectanglemapitem_p_p.h
@@ -61,12 +61,10 @@ QT_BEGIN_NAMESPACE
 
 class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItemPrivate
 {
+    Q_DISABLE_COPY_MOVE(QDeclarativeRectangleMapItemPrivate)
 public:
-    QDeclarativeRectangleMapItemPrivate(QDeclarativeRectangleMapItem &rect) : m_rect(rect)
-    {
-
-    }
-    QDeclarativeRectangleMapItemPrivate(QDeclarativeRectangleMapItemPrivate &other) : m_rect(other.m_rect)
+    QDeclarativeRectangleMapItemPrivate(QDeclarativeRectangleMapItem &rect)
+        : m_rect(rect)
     {
     }
 
@@ -87,12 +85,8 @@ public:
 class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItemPrivateCPU: public QDeclarativeRectangleMapItemPrivate
 {
 public:
-    QDeclarativeRectangleMapItemPrivateCPU(QDeclarativeRectangleMapItem &rect) : QDeclarativeRectangleMapItemPrivate(rect)
-    {
-    }
-
-    QDeclarativeRectangleMapItemPrivateCPU(QDeclarativeRectangleMapItemPrivate &other)
-    : QDeclarativeRectangleMapItemPrivate(other)
+    QDeclarativeRectangleMapItemPrivateCPU(QDeclarativeRectangleMapItem &rect)
+        : QDeclarativeRectangleMapItemPrivate(rect)
     {
     }
 
diff --git a/src/location/quickmapitems/rhi/qdeclarativecirclemapitem_rhi_p.h b/src/location/quickmapitems/rhi/qdeclarativecirclemapitem_rhi_p.h
index 9bf60106..ba59232d 100644
--- a/src/location/quickmapitems/rhi/qdeclarativecirclemapitem_rhi_p.h
+++ b/src/location/quickmapitems/rhi/qdeclarativecirclemapitem_rhi_p.h
@@ -63,12 +63,8 @@ QT_BEGIN_NAMESPACE
 class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItemPrivateOpenGL: public QDeclarativeCircleMapItemPrivate
 {
 public:
-    QDeclarativeCircleMapItemPrivateOpenGL(QDeclarativeCircleMapItem &circle) : QDeclarativeCircleMapItemPrivate(circle)
-    {
-    }
-
-    QDeclarativeCircleMapItemPrivateOpenGL(QDeclarativeCircleMapItemPrivate &other)
-    : QDeclarativeCircleMapItemPrivate(other)
+    QDeclarativeCircleMapItemPrivateOpenGL(QDeclarativeCircleMapItem &circle)
+        : QDeclarativeCircleMapItemPrivate(circle)
     {
     }
 
diff --git a/src/location/quickmapitems/rhi/qdeclarativepolygonmapitem_rhi_p.h b/src/location/quickmapitems/rhi/qdeclarativepolygonmapitem_rhi_p.h
index 5d178aad..1ef1dce2 100644
--- a/src/location/quickmapitems/rhi/qdeclarativepolygonmapitem_rhi_p.h
+++ b/src/location/quickmapitems/rhi/qdeclarativepolygonmapitem_rhi_p.h
@@ -167,12 +167,8 @@ public:
         }
     };
 
-    QDeclarativePolygonMapItemPrivateOpenGL(QDeclarativePolygonMapItem &polygon) : QDeclarativePolygonMapItemPrivate(polygon)
-    {
-    }
-
-    QDeclarativePolygonMapItemPrivateOpenGL(QDeclarativePolygonMapItemPrivate &other)
-        : QDeclarativePolygonMapItemPrivate(other)
+    QDeclarativePolygonMapItemPrivateOpenGL(QDeclarativePolygonMapItem &polygon)
+        : QDeclarativePolygonMapItemPrivate(polygon)
     {
     }
 
diff --git a/src/location/quickmapitems/rhi/qdeclarativepolylinemapitem_rhi_p.h b/src/location/quickmapitems/rhi/qdeclarativepolylinemapitem_rhi_p.h
index 8387eae6..1fd07574 100644
--- a/src/location/quickmapitems/rhi/qdeclarativepolylinemapitem_rhi_p.h
+++ b/src/location/quickmapitems/rhi/qdeclarativepolylinemapitem_rhi_p.h
@@ -253,12 +253,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivateOpenGLLineStri
 {
 public:
 
-    QDeclarativePolylineMapItemPrivateOpenGLLineStrip(QDeclarativePolylineMapItem &poly) : QDeclarativePolylineMapItemPrivate(poly)
-    {
-    }
-
-    QDeclarativePolylineMapItemPrivateOpenGLLineStrip(QDeclarativePolylineMapItemPrivate &other)
-    : QDeclarativePolylineMapItemPrivate(other)
+    QDeclarativePolylineMapItemPrivateOpenGLLineStrip(QDeclarativePolylineMapItem &poly)
+        : QDeclarativePolylineMapItemPrivate(poly)
     {
     }
 
@@ -312,12 +308,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivateOpenGLExtruded
 public:
 
     QDeclarativePolylineMapItemPrivateOpenGLExtruded(QDeclarativePolylineMapItem &poly)
-    : QDeclarativePolylineMapItemPrivateOpenGLLineStrip(poly)
-    {
-    }
-
-    QDeclarativePolylineMapItemPrivateOpenGLExtruded(QDeclarativePolylineMapItemPrivate &other)
-    : QDeclarativePolylineMapItemPrivateOpenGLLineStrip(other)
+        : QDeclarativePolylineMapItemPrivateOpenGLLineStrip(poly)
     {
     }
 
diff --git a/src/location/quickmapitems/rhi/qdeclarativerectanglemapitem_rhi_p.h b/src/location/quickmapitems/rhi/qdeclarativerectanglemapitem_rhi_p.h
index 65cf682f..d8cccaa6 100644
--- a/src/location/quickmapitems/rhi/qdeclarativerectanglemapitem_rhi_p.h
+++ b/src/location/quickmapitems/rhi/qdeclarativerectanglemapitem_rhi_p.h
@@ -63,12 +63,8 @@ QT_BEGIN_NAMESPACE
 class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItemPrivateOpenGL: public QDeclarativeRectangleMapItemPrivate
 {
 public:
-    QDeclarativeRectangleMapItemPrivateOpenGL(QDeclarativeRectangleMapItem &rect) : QDeclarativeRectangleMapItemPrivate(rect)
-    {
-    }
-
-    QDeclarativeRectangleMapItemPrivateOpenGL(QDeclarativeRectangleMapItemPrivate &other)
-    : QDeclarativeRectangleMapItemPrivate(other)
+    QDeclarativeRectangleMapItemPrivateOpenGL(QDeclarativeRectangleMapItem &rect)
+        : QDeclarativeRectangleMapItemPrivate(rect)
     {
     }