Update QgsMapLayer to current naming convention for CRS; srs() function left for API compatability (note was added to warn of future changes in 2.0)

cfarmer · cfarmer · commit b4a6b417dbc9 · 2009-11-07T08:47:44.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@11943 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/core/qgsmaplayer.sip b/python/core/qgsmaplayer.sip
@@ -188,7 +188,17 @@ public:
      */
     virtual QString lastError();
 
-    /** Returns layer's spatial reference system */
+    /** Returns layer's spatial reference system
+    @note This was introduced in QGIS 1.4
+    */
+    
+    const QgsCoordinateReferenceSystem& crs();
+
+    /** Returns layer's spatial reference system
+    @note This method is here for API compatibility
+    and will be deprecited in 2.0
+    @see crs()
+    */
     const QgsCoordinateReferenceSystem& srs();
     
     /** Sets layer's spatial reference system */
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
@@ -427,8 +427,15 @@ void QgsMapLayer::setSubLayerVisibility( QString name, bool vis )
   // NOOP
 }
 
+const QgsCoordinateReferenceSystem& QgsMapLayer::crs()
+{
+  return *mCRS;
+}
+
 const QgsCoordinateReferenceSystem& QgsMapLayer::srs()
 {
+  // This will be dropped in QGIS 2.0 due to conflicting name
+  // Please use crs() in the future
   return *mCRS;
 }
 
diff --git a/src/core/qgsmaplayer.h b/src/core/qgsmaplayer.h
@@ -190,7 +190,16 @@ class CORE_EXPORT QgsMapLayer : public QObject
      */
     virtual QString lastError();
 
-    /** Returns layer's spatial reference system */
+    /** Returns layer's spatial reference system
+    @note This was introduced in QGIS 1.4
+    */
+    const QgsCoordinateReferenceSystem& crs();
+
+    /** Returns layer's spatial reference system
+    @note This method is here for API compatibility
+    and will be deprecited in 2.0
+    @see crs()
+    */
     const QgsCoordinateReferenceSystem& srs();
 
     /** Sets layer's spatial reference system */

Original file line number	Diff line number	Diff line change
`@@ -427,8 +427,15 @@ void QgsMapLayer::setSubLayerVisibility( QString name, bool vis )`
`427`	`427`	`// NOOP`
`428`	`428`	`}`
`429`	`429`
	`430`	`+const QgsCoordinateReferenceSystem& QgsMapLayer::crs()`
	`431`	`+{`
	`432`	`+ return *mCRS;`
	`433`	`+}`
	`434`	`+`
`430`	`435`	`const QgsCoordinateReferenceSystem& QgsMapLayer::srs()`
`431`	`436`	`{`
	`437`	`+ // This will be dropped in QGIS 2.0 due to conflicting name`
	`438`	`+ // Please use crs() in the future`
`432`	`439`	`return *mCRS;`
`433`	`440`	`}`
`434`	`441`