Changed poorly named EPSGID constant to GEOEPSG_ID

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9005 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: timlinux

python/core/qgis.sip

@@ -99,7 +99,7 @@ public:
   /** Magic number for a geographic coord sys in QGIS srs.db tbl_srs.srs_id */
   const long GEOSRS_ID;
   /**  Magic number for a geographic coord sys in EPSG ID format */
-  const long EPSGID;
+  const long GEOEPSG_ID;
   /** The length of teh string "+proj=" */
   const int PROJ_PREFIX_LEN;
   /** The length of teh string "+ellps=" */

src/core/qgis.h

@@ -122,7 +122,7 @@ class CORE_EXPORT QGis
   /** Magic number for a geographic coord sys in QGIS srs.db tbl_srs.srs_id */
   const long GEOSRS_ID = 2585;
   /**  Magic number for a geographic coord sys in EPSG ID format */
-  const long EPSGID = 4326;
+  const long GEOEPSG_ID = 4326;
   /** The length of teh string "+proj=" */
   const int PROJ_PREFIX_LEN = 6;
   /** The length of teh string "+ellps=" */

src/core/qgsdistancearea.cpp

@@ -43,7 +43,7 @@ QgsDistanceArea::QgsDistanceArea()
   // init with default settings
   mProjectionsEnabled = FALSE;
   mCoordTransform = new QgsCoordinateTransform;
-  setSourceEPSG(EPSGID); // WGS 84
+  setSourceEPSG(GEOEPSG_ID); // WGS 84
   setEllipsoid("WGS84");
 }
 

src/core/qgsmaprenderer.cpp

@@ -48,7 +48,7 @@ QgsMapRenderer::QgsMapRenderer()
   mSize = QSize(0,0);
 
   mProjectionsEnabled = FALSE;
-  mDestSRS = new QgsSpatialRefSys(EPSGID, QgsSpatialRefSys::EPSG); //WGS 84
+  mDestSRS = new QgsSpatialRefSys(GEOEPSG_ID, QgsSpatialRefSys::EPSG); //WGS 84
 }
 
 QgsMapRenderer::~QgsMapRenderer()

src/core/qgsspatialrefsys.cpp

@@ -953,7 +953,7 @@ bool QgsSpatialRefSys::readXML( QDomNode & theNode )
   else
   {
     // Return default SRS if none was found in the XML.
-    createFromEpsg(EPSGID);
+    createFromEpsg(GEOEPSG_ID);
   }
   return true;
 }