Skip to content

Commit d13cda6

Browse files
author
jef
committed
missed a file in r10659
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10659 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 6650c0d commit d13cda6

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

src/providers/grass/qgsgrass.cpp

+4-13
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,12 @@ void GRASS_EXPORT QgsGrass::init( void )
9595
#else
9696
QString gisBase = getenv( "GISBASE" );
9797
#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 ) );
10199
if ( !isValidGrassBaseDir( gisBase ) )
102100
{
103101
// Look for gisbase in QSettings
104102
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 ) );
108104
}
109105

110106
if ( !isValidGrassBaseDir( gisBase ) )
@@ -119,10 +115,7 @@ void GRASS_EXPORT QgsGrass::init( void )
119115
#else
120116
// Use the location specified --with-grass during configure
121117
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 ) );
126119
#endif
127120
}
128121

@@ -173,9 +166,7 @@ void GRASS_EXPORT QgsGrass::init( void )
173166
settings.setValue( "/GRASS/gisbase", gisBase );
174167
}
175168

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 ) );
179170
QString gisBaseEnv = "GISBASE=" + gisBase;
180171
/* _Correct_ putenv() implementation is not making copy! */
181172
char *gisBaseEnvChar = new char[gisBaseEnv.length()+1];

0 commit comments

Comments
 (0)