@@ -95,16 +95,12 @@ void GRASS_EXPORT QgsGrass::init( void )
95
95
#else
96
96
QString gisBase = getenv ( " GISBASE" );
97
97
#endif
98
- #ifdef QGISDEBUG
99
- qDebug ( " %s:%d GRASS gisBase from GISBASE env var is: %s" , __FILE__, __LINE__, gisBase.toAscii ().constData () );
100
- #endif
98
+ QgsDebugMsg ( QString ( " GRASS gisBase from GISBASE env var is: %1" ).arg ( gisBase ) );
101
99
if ( !isValidGrassBaseDir ( gisBase ) )
102
100
{
103
101
// Look for gisbase in QSettings
104
102
gisBase = settings.value ( " /GRASS/gisbase" , " " ).toString ();
105
- #ifdef QGISDEBUG
106
- qDebug ( " %s:%d GRASS gisBase from QSettings is: %s" , __FILE__, __LINE__, gisBase.toAscii ().constData () );
107
- #endif
103
+ QgsDebugMsg ( QString ( " GRASS gisBase from QSettings is: %1" ).arg ( gisBase ) );
108
104
}
109
105
110
106
if ( !isValidGrassBaseDir ( gisBase ) )
@@ -119,10 +115,7 @@ void GRASS_EXPORT QgsGrass::init( void )
119
115
#else
120
116
// Use the location specified --with-grass during configure
121
117
gisBase = GRASS_BASE;
122
- #ifdef QGISDEBUG
123
- qDebug ( " %s:%d GRASS gisBase from configure is: %s" , __FILE__, __LINE__, gisBase.toAscii ().constData () );
124
- #endif
125
-
118
+ QgsDebugMsg ( QString ( " GRASS gisBase from configure is: %1" ).arg ( gisBase ) );
126
119
#endif
127
120
}
128
121
@@ -173,9 +166,7 @@ void GRASS_EXPORT QgsGrass::init( void )
173
166
settings.setValue ( " /GRASS/gisbase" , gisBase );
174
167
}
175
168
176
- #ifdef QGISDEBUG
177
- qDebug ( " %s:%d Valid GRASS gisBase is: %s" , __FILE__, __LINE__, gisBase.toAscii ().constData () );
178
- #endif
169
+ QgsDebugMsg ( QString ( " Valid GRASS gisBase is: %1" ).arg ( gisBase ) );
179
170
QString gisBaseEnv = " GISBASE=" + gisBase;
180
171
/* _Correct_ putenv() implementation is not making copy! */
181
172
char *gisBaseEnvChar = new char [gisBaseEnv.length ()+1 ];
0 commit comments