Skip to content
Permalink
Browse files
enabled toLocal8Bit for GISDBASE on win
git-svn-id: http://svn.osgeo.org/qgis/trunk@13158 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
rblazek committed Mar 25, 2010
1 parent 0cff6f5 commit be05a7584587094218736f6073831e5f8de2611d
Showing with 10 additions and 8 deletions.
  1. +10 −8 src/providers/grass/qgsgrass.cpp
@@ -330,11 +330,13 @@ void QgsGrass::setLocation( QString gisdbase, QString location )
init();

// Set principal GRASS variables (in memory)
// #if defined(WIN32)
// G__setenv(( char * ) "GISDBASE", shortPath( gisdbase ).toLocal8Bit().data() );
//#else
#if defined(WIN32)
G__setenv(( char * ) "GISDBASE", shortPath( gisdbase ).toLocal8Bit().data() );
#else
// This does not work for GISBAS with non ascii chars on Windows XP,
// gives error 'LOCATION ... not available':
G__setenv(( char * ) "GISDBASE", gisdbase.toUtf8().constData() );
//#endif
#endif
G__setenv(( char * ) "LOCATION_NAME", location.toUtf8().constData() );
G__setenv(( char * ) "MAPSET", ( char * ) "PERMANENT" ); // PERMANENT must always exist

@@ -349,11 +351,11 @@ void QgsGrass::setMapset( QString gisdbase, QString location, QString mapset )
init();

// Set principal GRASS variables (in memory)
// #if defined(WIN32)
// G__setenv(( char * ) "GISDBASE", shortPath( gisdbase ).toUtf8().data() );
// #else
#if defined(WIN32)
G__setenv(( char * ) "GISDBASE", shortPath( gisdbase ).toUtf8().data() );
#else
G__setenv(( char * ) "GISDBASE", gisdbase.toUtf8().data() );
// #endif
#endif
G__setenv(( char * ) "LOCATION_NAME", location.toUtf8().data() );
G__setenv(( char * ) "MAPSET", mapset.toUtf8().data() );

0 comments on commit be05a75

Please sign in to comment.