From 198486f0e9eefdd8dfb1f2fff665a815d366ddf4 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 18 Dec 2017 21:18:51 +1000 Subject: [PATCH] Avoid including private header --- python/core/qgscoordinatetransformcontext.sip | 3 ++- src/core/qgscoordinatetransformcontext.cpp | 2 ++ src/core/qgscoordinatetransformcontext.h | 7 +++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/python/core/qgscoordinatetransformcontext.sip b/python/core/qgscoordinatetransformcontext.sip index c51b0827e38..bc6fe437e83 100644 --- a/python/core/qgscoordinatetransformcontext.sip +++ b/python/core/qgscoordinatetransformcontext.sip @@ -12,7 +12,6 @@ - class QgsCoordinateTransformContext { %Docstring @@ -51,6 +50,8 @@ applies for destination CRS transforms set using addDestinationDatumTransform(). Constructor for QgsCoordinateTransformContext. %End + ~QgsCoordinateTransformContext(); + QgsCoordinateTransformContext( const QgsCoordinateTransformContext &rhs ); %Docstring Copy constructor diff --git a/src/core/qgscoordinatetransformcontext.cpp b/src/core/qgscoordinatetransformcontext.cpp index 99d7a80ae4f..22039d390b1 100644 --- a/src/core/qgscoordinatetransformcontext.cpp +++ b/src/core/qgscoordinatetransformcontext.cpp @@ -24,6 +24,8 @@ QgsCoordinateTransformContext::QgsCoordinateTransformContext() : d( new QgsCoordinateTransformContextPrivate() ) {} +QgsCoordinateTransformContext::~QgsCoordinateTransformContext() = default; + QgsCoordinateTransformContext::QgsCoordinateTransformContext( const QgsCoordinateTransformContext &rhs ) //NOLINT : d( rhs.d ) {} diff --git a/src/core/qgscoordinatetransformcontext.h b/src/core/qgscoordinatetransformcontext.h index 24b4e4f5c3d..de30edc9eab 100644 --- a/src/core/qgscoordinatetransformcontext.h +++ b/src/core/qgscoordinatetransformcontext.h @@ -20,11 +20,12 @@ #include "qgis_core.h" #include "qgis.h" -#include "qgscoordinatetransformcontext_p.h" #include "qgsdatumtransform.h" +class QgsCoordinateReferenceSystem; class QgsReadWriteContext; - +class QgsCoordinateTransformContextPrivate; +class QDomElement; /*************************************************************************** * This class is considered CRITICAL and any change MUST be accompanied with @@ -64,6 +65,8 @@ class CORE_EXPORT QgsCoordinateTransformContext */ QgsCoordinateTransformContext(); + ~QgsCoordinateTransformContext(); + /** * Copy constructor */