From 2d0be1cf69e561510525a63ab07233c6a3ce40ab Mon Sep 17 00:00:00 2001 From: Sebastian Dietrich Date: Fri, 11 Dec 2015 23:24:31 +0100 Subject: [PATCH] Changed the parameter of QgsCoordinateReferenceSystem::readXML() to const and removed const_cast<> where not needed any longer --- python/core/qgscoordinatereferencesystem.sip | 2 +- src/core/composer/qgscomposermapgrid.cpp | 2 +- src/core/qgscoordinatereferencesystem.cpp | 2 +- src/core/qgscoordinatereferencesystem.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/core/qgscoordinatereferencesystem.sip b/python/core/qgscoordinatereferencesystem.sip index 3bf126cd5317..7b9228bb2972 100644 --- a/python/core/qgscoordinatereferencesystem.sip +++ b/python/core/qgscoordinatereferencesystem.sip @@ -185,7 +185,7 @@ class QgsCoordinateReferenceSystem * @param theNode The node from which state will be restored * @return bool True on success, False on failure */ - bool readXML( QDomNode & theNode ); + bool readXML( const QDomNode & theNode ); /** Stores state to the given Dom node in the given document. * Below is an example of the generated tag. \code{.xml} diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp index 6d3276a3e24f..c9c33581a11f 100644 --- a/src/core/composer/qgscomposermapgrid.cpp +++ b/src/core/composer/qgscomposermapgrid.cpp @@ -404,7 +404,7 @@ bool QgsComposerMapGrid::readXML( const QDomElement& itemElem, const QDomDocumen QDomElement crsElem = itemElem.firstChildElement( "spatialrefsys" ); if ( !crsElem.isNull() ) { - mCRS.readXML( const_cast( itemElem ) ); //better would be to change argument in QgsCoordinateReferenceSystem::readXML to const + mCRS.readXML( itemElem ); } else { diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp index 7823754507c7..435cc36c7d5f 100644 --- a/src/core/qgscoordinatereferencesystem.cpp +++ b/src/core/qgscoordinatereferencesystem.cpp @@ -1145,7 +1145,7 @@ QString QgsCoordinateReferenceSystem::toWkt() const return mWkt; } -bool QgsCoordinateReferenceSystem::readXML( QDomNode & theNode ) +bool QgsCoordinateReferenceSystem::readXML( const QDomNode & theNode ) { QgsDebugMsg( "Reading Spatial Ref Sys from xml ------------------------!" ); QDomNode srsNode = theNode.namedItem( "spatialrefsys" ); diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h index 5d3306e95042..3133c6a07d6e 100644 --- a/src/core/qgscoordinatereferencesystem.h +++ b/src/core/qgscoordinatereferencesystem.h @@ -230,7 +230,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem * @param theNode The node from which state will be restored * @return bool True on success, False on failure */ - bool readXML( QDomNode & theNode ); + bool readXML( const QDomNode & theNode ); /** Stores state to the given Dom node in the given document. * Below is an example of the generated tag. \code{.xml}