Apply a patch from Matthieu Desile to allow compilation under gcc 4.1.1

git-svn-id: http://svn.osgeo.org/qgis/trunk@5510 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jun 8, 2006 · 3ac0c77 · 3ac0c77
1 parent 44339a8
commit 3ac0c77
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/providers/grass/qgsgrass.h b/src/providers/grass/qgsgrass.h
@@ -114,33 +114,31 @@ class QgsGrass {
     static QStringList elements(QString mapsetPath, QString element);
 
     // ! Get map region
-    static bool QgsGrass::mapRegion( int type, QString gisbase,
+    static bool mapRegion( int type, QString gisbase,
            QString location, QString mapset, QString map,
            struct Cell_head *window );
 
     // ! String representation of region
-    static QString QgsGrass::regionString( struct Cell_head *window );
+    static QString regionString( struct Cell_head *window );
 
     // ! Read current mapset region
-    static bool QgsGrass::region( QString gisbase,
-           QString location, QString mapset,
+    static bool region( QString gisbase, QString location, QString mapset,
            struct Cell_head *window );
 
     // ! Write current mapset region
-    static bool QgsGrass::writeRegion( QString gisbase,
-           QString location, QString mapset,
+    static bool writeRegion( QString gisbase, QString location, QString mapset,
            struct Cell_head *window );
 
     // ! Set (copy) region extent, resolution is not changed 
-    static void QgsGrass::copyRegionExtent( struct Cell_head *source,
+    static void copyRegionExtent( struct Cell_head *source,
            struct Cell_head *target );
 
     // ! Set (copy) region resolution, extent is not changed 
-    static void QgsGrass::copyRegionResolution( struct Cell_head *source,
+    static void copyRegionResolution( struct Cell_head *source,
            struct Cell_head *target );
 
     // ! Extend region in target to source 
-    static void QgsGrass::extendRegion( struct Cell_head *source,
+    static void extendRegion( struct Cell_head *source,
            struct Cell_head *target );
 
     static void init (void); 
@@ -149,8 +147,8 @@ class QgsGrass {
     static bool isMapset ( QString path );
 
     //! Library version
-    static int QgsGrass::versionMajor();
-    static int QgsGrass::versionMinor();
+    static int versionMajor();
+    static int versionMinor();
 
 private:
     static int initialized; // Set to 1 after initialization