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@10659 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Apr 26, 2009
1 parent dd18891 commit 3df4775
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions src/providers/grass/qgsgrass.cpp
Expand Up @@ -95,16 +95,12 @@ void GRASS_EXPORT QgsGrass::init( void )
#else #else
QString gisBase = getenv( "GISBASE" ); QString gisBase = getenv( "GISBASE" );
#endif #endif
#ifdef QGISDEBUG QgsDebugMsg( QString( "GRASS gisBase from GISBASE env var is: %1" ).arg( gisBase ) );
qDebug( "%s:%d GRASS gisBase from GISBASE env var is: %s", __FILE__, __LINE__, gisBase.toAscii().constData() );
#endif
if ( !isValidGrassBaseDir( gisBase ) ) if ( !isValidGrassBaseDir( gisBase ) )
{ {
// Look for gisbase in QSettings // Look for gisbase in QSettings
gisBase = settings.value( "/GRASS/gisbase", "" ).toString(); gisBase = settings.value( "/GRASS/gisbase", "" ).toString();
#ifdef QGISDEBUG QgsDebugMsg( QString( "GRASS gisBase from QSettings is: %1" ).arg( gisBase ) );
qDebug( "%s:%d GRASS gisBase from QSettings is: %s", __FILE__, __LINE__, gisBase.toAscii().constData() );
#endif
} }


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

#endif #endif
} }


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


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

0 comments on commit 3df4775

Please sign in to comment.