Skip to content

Commit 3ac0c77

Browse files
author
g_j_m
committed
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
1 parent 44339a8 commit 3ac0c77

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

src/providers/grass/qgsgrass.h

+9-11
Original file line numberDiff line numberDiff line change
@@ -114,33 +114,31 @@ class QgsGrass {
114114
static QStringList elements(QString mapsetPath, QString element);
115115

116116
// ! Get map region
117-
static bool QgsGrass::mapRegion( int type, QString gisbase,
117+
static bool mapRegion( int type, QString gisbase,
118118
QString location, QString mapset, QString map,
119119
struct Cell_head *window );
120120

121121
// ! String representation of region
122-
static QString QgsGrass::regionString( struct Cell_head *window );
122+
static QString regionString( struct Cell_head *window );
123123

124124
// ! Read current mapset region
125-
static bool QgsGrass::region( QString gisbase,
126-
QString location, QString mapset,
125+
static bool region( QString gisbase, QString location, QString mapset,
127126
struct Cell_head *window );
128127

129128
// ! Write current mapset region
130-
static bool QgsGrass::writeRegion( QString gisbase,
131-
QString location, QString mapset,
129+
static bool writeRegion( QString gisbase, QString location, QString mapset,
132130
struct Cell_head *window );
133131

134132
// ! Set (copy) region extent, resolution is not changed
135-
static void QgsGrass::copyRegionExtent( struct Cell_head *source,
133+
static void copyRegionExtent( struct Cell_head *source,
136134
struct Cell_head *target );
137135

138136
// ! Set (copy) region resolution, extent is not changed
139-
static void QgsGrass::copyRegionResolution( struct Cell_head *source,
137+
static void copyRegionResolution( struct Cell_head *source,
140138
struct Cell_head *target );
141139

142140
// ! Extend region in target to source
143-
static void QgsGrass::extendRegion( struct Cell_head *source,
141+
static void extendRegion( struct Cell_head *source,
144142
struct Cell_head *target );
145143

146144
static void init (void);
@@ -149,8 +147,8 @@ class QgsGrass {
149147
static bool isMapset ( QString path );
150148

151149
//! Library version
152-
static int QgsGrass::versionMajor();
153-
static int QgsGrass::versionMinor();
150+
static int versionMajor();
151+
static int versionMinor();
154152

155153
private:
156154
static int initialized; // Set to 1 after initialization

0 commit comments

Comments
 (0)