Remove QgsCoordinateTransform::clone()

nyalldawson · nyalldawson · commit b18fcc0ddfa1 · 2016-07-16T14:16:00.000+10:00
Just use direct copies instead
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -23,6 +23,7 @@ This page tries to maintain a list with incompatible changes that happened in pr
 <ul>
 <li>QgsCoordinateTransform is no longer a QObject. readXml, writeXml and initialise are all normal public members now,
 not slots. The invalidTransformInput() signal has been removed.</li>
+<li>QgsCoordinateTransform::clone() has been removed. Just use direct copies instead.</li>
 <li>sourceCrs() and destCrs() now return a copy instead of a reference to the CRS. This has no effect on PyQGIS code, but c++
 plugins calling these methods will need to be updated.</li>
 </ul>
diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip
@@ -64,8 +64,6 @@ class QgsCoordinateTransform
     //! destructor
     ~QgsCoordinateTransform();
 
-    QgsCoordinateTransform* clone() const /Factory/;
-
     /*!
      * Set the source (layer) QgsCoordinateReferenceSystem
      * @param theCRS QgsCoordinateReferenceSystem representation of the layer's coordinate system
diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
@@ -74,15 +74,6 @@ QgsCoordinateTransform::QgsCoordinateTransform( long sourceSrid,
   d = new QgsCoordinateTransformPrivate( sourceCrs, QgsCRSCache::instance()->crsByWkt( destinationWkt ) );
 }
 
-QgsCoordinateTransform* QgsCoordinateTransform::clone() const
-{
-  QgsCoordinateTransform* tr = new QgsCoordinateTransform( sourceCrs(), destCRS() );
-  tr->setSourceDatumTransform( sourceDatumTransform() );
-  tr->setDestinationDatumTransform( destinationDatumTransform() );
-  tr->initialise();
-  return tr;
-}
-
 void QgsCoordinateTransform::setSourceCrs( const QgsCoordinateReferenceSystem& crs )
 {
   d.detach();
diff --git a/src/core/qgscoordinatetransform.h b/src/core/qgscoordinatetransform.h
@@ -85,8 +85,6 @@ class CORE_EXPORT QgsCoordinateTransform
                             const QString& theDestWkt,
                             QgsCoordinateReferenceSystem::CrsType theSourceCRSType = QgsCoordinateReferenceSystem::PostgisCrsId );
 
-    QgsCoordinateTransform* clone() const;
-
     /*!
      * Set the source (layer) QgsCoordinateReferenceSystem
      * @param theCRS QgsCoordinateReferenceSystem representation of the layer's coordinate system
diff --git a/src/core/qgsdiagramrendererv2.cpp b/src/core/qgsdiagramrendererv2.cpp
@@ -54,7 +54,7 @@ QgsDiagramLayerSettings::QgsDiagramLayerSettings( const QgsDiagramLayerSettings&
     , obstacle( rh.obstacle )
     , dist( rh.dist )
     , renderer( rh.renderer ? rh.renderer->clone() : nullptr )
-    , ct( rh.ct ? rh.ct->clone() : nullptr )
+    , ct( rh.ct ? new QgsCoordinateTransform( *rh.ct ): nullptr )
     , xform( rh.xform )
     , fields( rh.fields )
     , xPosColumn( rh.xPosColumn )
@@ -75,7 +75,7 @@ QgsDiagramLayerSettings&QgsDiagramLayerSettings::operator=( const QgsDiagramLaye
   obstacle = rh.obstacle;
   dist = rh.dist;
   renderer = rh.renderer ? rh.renderer->clone() : nullptr;
-  ct = rh.ct ? rh.ct->clone() : nullptr;
+  ct = rh.ct ? new QgsCoordinateTransform( *rh.ct ) : nullptr;
   xform = rh.xform;
   fields = rh.fields;
   xPosColumn = rh.xPosColumn;
diff --git a/src/core/qgsvectorlayerdiagramprovider.cpp b/src/core/qgsvectorlayerdiagramprovider.cpp
@@ -163,7 +163,7 @@ bool QgsVectorLayerDiagramProvider::prepare( const QgsRenderContext& context, QS
   {
     if ( context.coordinateTransform() )
       // this is context for layer rendering - use its CT as it includes correct datum transform
-      s2.setCoordinateTransform( context.coordinateTransform()->clone() );
+      s2.setCoordinateTransform( new QgsCoordinateTransform( *context.coordinateTransform() ) );
     else
       // otherwise fall back to creating our own CT - this one may not have the correct datum transform!
       s2.setCoordinateTransform( new QgsCoordinateTransform( mLayerCrs, mapSettings.destinationCrs() ) );
diff --git a/src/core/qgsvectorlayerlabelprovider.cpp b/src/core/qgsvectorlayerlabelprovider.cpp
@@ -233,7 +233,7 @@ bool QgsVectorLayerLabelProvider::prepare( const QgsRenderContext& context, QStr
   {
     if ( context.coordinateTransform() )
       // this is context for layer rendering - use its CT as it includes correct datum transform
-      lyr.ct = context.coordinateTransform()->clone();
+      lyr.ct = new QgsCoordinateTransform( *context.coordinateTransform() );
     else
       // otherwise fall back to creating our own CT - this one may not have the correct datum transform!
       lyr.ct = new QgsCoordinateTransform( mCrs, mapSettings.destinationCrs() );

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ bool QgsVectorLayerDiagramProvider::prepare( const QgsRenderContext& context, QS`
`163`	`163`	`{`
`164`	`164`	`if ( context.coordinateTransform() )`
`165`	`165`	`// this is context for layer rendering - use its CT as it includes correct datum transform`
`166`		`- s2.setCoordinateTransform( context.coordinateTransform()->clone() );`
	`166`	`+ s2.setCoordinateTransform( new QgsCoordinateTransform( *context.coordinateTransform() ) );`
`167`	`167`	`else`
`168`	`168`	`// otherwise fall back to creating our own CT - this one may not have the correct datum transform!`
`169`	`169`	`s2.setCoordinateTransform( new QgsCoordinateTransform( mLayerCrs, mapSettings.destinationCrs() ) );`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ bool QgsVectorLayerLabelProvider::prepare( const QgsRenderContext& context, QStr`
`233`	`233`	`{`
`234`	`234`	`if ( context.coordinateTransform() )`
`235`	`235`	`// this is context for layer rendering - use its CT as it includes correct datum transform`
`236`		`- lyr.ct = context.coordinateTransform()->clone();`
	`236`	`+ lyr.ct = new QgsCoordinateTransform( *context.coordinateTransform() );`
`237`	`237`	`else`
`238`	`238`	`// otherwise fall back to creating our own CT - this one may not have the correct datum transform!`
`239`	`239`	`lyr.ct = new QgsCoordinateTransform( mCrs, mapSettings.destinationCrs() );`