Workaround for change in GRASS's version.h in cvs >= 26.4.2007

wonder · wonder · commit c7c9e8b2ae2f · 2007-05-01T21:34:03.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6923 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -985,17 +985,34 @@ bool QgsGrass::mapRegion( int type, QString gisbase,
     return true;
 }
 
+// GRASS version constants have been changed on 26.4.2007
+// http://freegis.org/cgi-bin/viewcvs.cgi/grass6/include/version.h.in.diff?r1=1.4&r2=1.5
+// The following lines workaround this change
+
 int QgsGrass::versionMajor()
 {
+#ifdef GRASS_VERSION_MAJOR
+    return GRASS_VERSION_MAJOR;
+#else
     return QString(GRASS_VERSION_MAJOR).toInt();
+#endif
 }
 int QgsGrass::versionMinor()
 {
+#ifdef GRASS_VERSION_MINOR
+    return GRASS_VERSION_MINOR;
+#else
     return QString(GRASS_VERSION_MINOR).toInt();
+#endif
 }
 int QgsGrass::versionRelease()
 {
+#ifdef GRASS_VERSION_RELEASE
+    #define QUOTE(x)  #x
+    return QString(QUOTE(GRASS_VERSION_RELEASE)).toInt();
+#else
     return QString(GRASS_VERSION_RELEASE).toInt();
+#endif
 }
 QString QgsGrass::versionString()
 {

Original file line number	Diff line number	Diff line change
`@@ -985,17 +985,34 @@ bool QgsGrass::mapRegion( int type, QString gisbase,`
`985`	`985`	`return true;`
`986`	`986`	`}`
`987`	`987`
	`988`	`+// GRASS version constants have been changed on 26.4.2007`
	`989`	`+// http://freegis.org/cgi-bin/viewcvs.cgi/grass6/include/version.h.in.diff?r1=1.4&r2=1.5`
	`990`	`+// The following lines workaround this change`
	`991`	`+`
`988`	`992`	`int QgsGrass::versionMajor()`
`989`	`993`	`{`
	`994`	`+#ifdef GRASS_VERSION_MAJOR`
	`995`	`+ return GRASS_VERSION_MAJOR;`
	`996`	`+#else`
`990`	`997`	`return QString(GRASS_VERSION_MAJOR).toInt();`
	`998`	`+#endif`
`991`	`999`	`}`
`992`	`1000`	`int QgsGrass::versionMinor()`
`993`	`1001`	`{`
	`1002`	`+#ifdef GRASS_VERSION_MINOR`
	`1003`	`+ return GRASS_VERSION_MINOR;`
	`1004`	`+#else`
`994`	`1005`	`return QString(GRASS_VERSION_MINOR).toInt();`
	`1006`	`+#endif`
`995`	`1007`	`}`
`996`	`1008`	`int QgsGrass::versionRelease()`
`997`	`1009`	`{`
	`1010`	`+#ifdef GRASS_VERSION_RELEASE`
	`1011`	`+ #define QUOTE(x) #x`
	`1012`	`+ return QString(QUOTE(GRASS_VERSION_RELEASE)).toInt();`
	`1013`	`+#else`
`998`	`1014`	`return QString(GRASS_VERSION_RELEASE).toInt();`
	`1015`	`+#endif`
`999`	`1016`	`}`
`1000`	`1017`	`QString QgsGrass::versionString()`
`1001`	`1018`	`{`