Fix some more compiler warnings. Apply -Werror to grass directories.

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

Author: g_j_m

src/plugins/grass/CMakeLists.txt

@@ -3,8 +3,6 @@ SUBDIRS(config modules themes)
 
 ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
 ADD_DEFINITIONS(-DHAVE_OPENPTY=${HAVE_OPENPTY})
-MESSAGE("plugins/grass : -Werror removed for this directory for now - please get rid of all warnings!")
-REMOVE_DEFINITIONS( -Werror )
 
 ########################################################
 # Files

src/plugins/grass/qgsgrassnewmapset.cpp

@@ -1,3 +1,4 @@
+
 /***************************************************************************
     qgsgrassnewmapset.cpp  - New GRASS mapset wizard
                                -------------------
@@ -61,6 +62,11 @@
 
 // For bug in GPJ_osr_to_grass()
 #include "grass/version.h"
+// Prevents some compiler warnings from the version.h include
+QString temp1(GRASS_VERSION_STRING);
+QString temp2(GRASS_VERSION_MAJOR);
+QString temp3(GRASS_VERSION_MINOR);
+QString temp4(GRASS_VERSION_RELEASE);
 
 bool QgsGrassNewMapset::mRunning = false;
 

src/providers/grass/CMakeLists.txt

@@ -1,7 +1,5 @@
 
 ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
-MESSAGE("providers/grass : -Werror removed for this directory for now - please get rid of all warnings!")
-REMOVE_DEFINITIONS( -Werror )
 
 ########################################################
 # Files

src/providers/grass/qgsgrass.cpp

@@ -987,6 +987,14 @@ int QgsGrass::versionMinor()
 {
     return QString(GRASS_VERSION_MINOR).toInt();
 }
+int QgsGrass::versionRelease()
+{
+    return QString(GRASS_VERSION_RELEASE).toInt();
+}
+QString QgsGrass::versionString()
+{
+    return QString(GRASS_VERSION_STRING);
+}
 
 bool QgsGrass::isMapset ( QString path )
 {

src/providers/grass/qgsgrass.h

@@ -149,6 +149,8 @@ class QgsGrass {
     //! Library version
     static int versionMajor();
     static int versionMinor();
+    static int versionRelease();
+    static QString versionString();
 
 private:
     static int initialized; // Set to 1 after initialization