Changed the parameter of QgsCoordinateReferenceSystem::readXML() to const

SebDieBln · SebDieBln · commit 2d0be1cf69e5 · 2015-12-12T00:05:10.000+01:00
and removed const_cast&lt;&gt; where not needed any longer
diff --git 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
@@ -404,7 +404,7 @@ bool QgsComposerMapGrid::readXML( const QDomElement& itemElem, const QDomDocumen
   QDomElement crsElem = itemElem.firstChildElement( "spatialrefsys" );
   if ( !crsElem.isNull() )
   {
-    mCRS.readXML( const_cast<QDomElement&>( 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
@@ -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
@@ -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}

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ bool QgsComposerMapGrid::readXML( const QDomElement& itemElem, const QDomDocumen`
`404`	`404`	`QDomElement crsElem = itemElem.firstChildElement( "spatialrefsys" );`
`405`	`405`	`if ( !crsElem.isNull() )`
`406`	`406`	`{`
`407`		`- mCRS.readXML( const_cast<QDomElement&>( itemElem ) ); //better would be to change argument in QgsCoordinateReferenceSystem::readXML to const`
	`407`	`+ mCRS.readXML( itemElem );`
`408`	`408`	`}`
`409`	`409`	`else`
`410`	`410`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1145,7 +1145,7 @@ QString QgsCoordinateReferenceSystem::toWkt() const`
`1145`	`1145`	`return mWkt;`
`1146`	`1146`	`}`
`1147`	`1147`
`1148`		`-bool QgsCoordinateReferenceSystem::readXML( QDomNode & theNode )`
	`1148`	`+bool QgsCoordinateReferenceSystem::readXML( const QDomNode & theNode )`
`1149`	`1149`	`{`
`1150`	`1150`	`QgsDebugMsg( "Reading Spatial Ref Sys from xml ------------------------!" );`
`1151`	`1151`	`QDomNode srsNode = theNode.namedItem( "spatialrefsys" );`