Skip to content

Commit

Permalink
missed a file in r10659
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10659 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Apr 26, 2009
1 parent 6650c0d commit d13cda6
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions src/providers/grass/qgsgrass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,12 @@ void GRASS_EXPORT QgsGrass::init( void )
#else
QString gisBase = getenv( "GISBASE" );
#endif
#ifdef QGISDEBUG
qDebug( "%s:%d GRASS gisBase from GISBASE env var is: %s", __FILE__, __LINE__, gisBase.toAscii().constData() );
#endif
QgsDebugMsg( QString( "GRASS gisBase from GISBASE env var is: %1" ).arg( gisBase ) );
if ( !isValidGrassBaseDir( gisBase ) )
{
// Look for gisbase in QSettings
gisBase = settings.value( "/GRASS/gisbase", "" ).toString();
#ifdef QGISDEBUG
qDebug( "%s:%d GRASS gisBase from QSettings is: %s", __FILE__, __LINE__, gisBase.toAscii().constData() );
#endif
QgsDebugMsg( QString( "GRASS gisBase from QSettings is: %1" ).arg( gisBase ) );
}

if ( !isValidGrassBaseDir( gisBase ) )
Expand All @@ -119,10 +115,7 @@ void GRASS_EXPORT QgsGrass::init( void )
#else
// Use the location specified --with-grass during configure
gisBase = GRASS_BASE;
#ifdef QGISDEBUG
qDebug( "%s:%d GRASS gisBase from configure is: %s", __FILE__, __LINE__, gisBase.toAscii().constData() );
#endif

QgsDebugMsg( QString( "GRASS gisBase from configure is: %1" ).arg( gisBase ) );
#endif
}

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

#ifdef QGISDEBUG
qDebug( "%s:%d Valid GRASS gisBase is: %s", __FILE__, __LINE__, gisBase.toAscii().constData() );
#endif
QgsDebugMsg( QString( "Valid GRASS gisBase is: %1" ).arg( gisBase ) );
QString gisBaseEnv = "GISBASE=" + gisBase;
/* _Correct_ putenv() implementation is not making copy! */
char *gisBaseEnvChar = new char[gisBaseEnv.length()+1];
Expand Down

0 comments on commit d13cda6

Please sign in to comment.