[QGIS Commit] r9005 - in trunk/qgis: python/core src/core

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-08-06 09:16:18 -0400 (Wed, 06 Aug 2008)
New Revision: 9005

Modified:
   trunk/qgis/python/core/qgis.sip
   trunk/qgis/src/core/qgis.h
   trunk/qgis/src/core/qgsdistancearea.cpp
   trunk/qgis/src/core/qgsmaprenderer.cpp
   trunk/qgis/src/core/qgsspatialrefsys.cpp
Log:
Changed poorly named EPSGID constant to GEOEPSG_ID

Modified: trunk/qgis/python/core/qgis.sip
===================================================================
--- trunk/qgis/python/core/qgis.sip	2008-08-06 12:50:54 UTC (rev 9004)
+++ trunk/qgis/python/core/qgis.sip	2008-08-06 13:16:18 UTC (rev 9005)
@@ -99,7 +99,7 @@
   /** 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=" */

Modified: trunk/qgis/src/core/qgis.h
===================================================================
--- trunk/qgis/src/core/qgis.h	2008-08-06 12:50:54 UTC (rev 9004)
+++ trunk/qgis/src/core/qgis.h	2008-08-06 13:16:18 UTC (rev 9005)
@@ -122,7 +122,7 @@
   /** 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=" */

Modified: trunk/qgis/src/core/qgsdistancearea.cpp
===================================================================
--- trunk/qgis/src/core/qgsdistancearea.cpp	2008-08-06 12:50:54 UTC (rev 9004)
+++ trunk/qgis/src/core/qgsdistancearea.cpp	2008-08-06 13:16:18 UTC (rev 9005)
@@ -43,7 +43,7 @@
   // init with default settings
   mProjectionsEnabled = FALSE;
   mCoordTransform = new QgsCoordinateTransform;
-  setSourceEPSG(EPSGID); // WGS 84
+  setSourceEPSG(GEOEPSG_ID); // WGS 84
   setEllipsoid("WGS84");
 }
 

Modified: trunk/qgis/src/core/qgsmaprenderer.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaprenderer.cpp	2008-08-06 12:50:54 UTC (rev 9004)
+++ trunk/qgis/src/core/qgsmaprenderer.cpp	2008-08-06 13:16:18 UTC (rev 9005)
@@ -48,7 +48,7 @@
   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()

Modified: trunk/qgis/src/core/qgsspatialrefsys.cpp
===================================================================
--- trunk/qgis/src/core/qgsspatialrefsys.cpp	2008-08-06 12:50:54 UTC (rev 9004)
+++ trunk/qgis/src/core/qgsspatialrefsys.cpp	2008-08-06 13:16:18 UTC (rev 9005)
@@ -953,7 +953,7 @@
   else
   {
     // Return default SRS if none was found in the XML.
-    createFromEpsg(EPSGID);
+    createFromEpsg(GEOEPSG_ID);
   }
   return true;
 }