diff --git a/python/core/qgis.sip b/python/core/qgis.sip index 0651d390fb0..8d15bebd591 100644 --- a/python/core/qgis.sip +++ b/python/core/qgis.sip @@ -100,8 +100,15 @@ public: }; - /** Wkt string that represents a geographic coord sys */ - const QString GEOWkt; + /** Wkt string that represents a geographic coord sys + * @note added in 1.8 to replace GEOWkt + */ + const QString GEOWKT; + /** Wkt string that represents a geographic coord sys + * @note deprecated in 1.8 due to violation of coding conventions (globals + * should be in all caps). + */ + const QString GEOWkt /Deprecated/; /** PROJ4 string that represents a geographic coord sys */ const QString GEOPROJ4; diff --git a/src/core/qgis.h b/src/core/qgis.h index 9455d50713a..8e459e6d7ca 100644 --- a/src/core/qgis.h +++ b/src/core/qgis.h @@ -133,8 +133,10 @@ inline bool doubleNear( double a, double b, double epsilon = 4 * DBL_EPSILON ) return diff > -epsilon && diff <= epsilon; } -/** Wkt string that represents a geographic coord sys */ -const QString GEOWkt = +/** Wkt string that represents a geographic coord sys + * @note added in 1.8 to replace GEOWkt + */ +const QString GEOWKT = "GEOGCS[\"WGS 84\", " " DATUM[\"WGS_1984\", " " SPHEROID[\"WGS 84\",6378137,298.257223563, " @@ -146,6 +148,11 @@ const QString GEOWkt = " AXIS[\"Lat\",NORTH], " " AXIS[\"Long\",EAST], " " AUTHORITY[\"EPSG\",4326]]"; +/** Wkt string that represents a geographic coord sys + * @note deprecated in 1.8 due to violation of coding conventions (globals + * should be in all caps). +*/ +Q_DECL_DEPRECATED const QString GEOWkt = GEOWKT; /** PROJ4 string that represents a geographic coord sys */ const QString GEOPROJ4 = "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs"; /** Magic number for a geographic coord sys in POSTGIS SRID */