[QGIS Commit] r15490 - trunk/qgis/src/providers/grass

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-14 16:24:20 -0700 (Mon, 14 Mar 2011)
New Revision: 15490

Modified:
   trunk/qgis/src/providers/grass/qgsgrass.cpp
Log:
fix #3582

Modified: trunk/qgis/src/providers/grass/qgsgrass.cpp
===================================================================
--- trunk/qgis/src/providers/grass/qgsgrass.cpp	2011-03-14 22:55:09 UTC (rev 15489)
+++ trunk/qgis/src/providers/grass/qgsgrass.cpp	2011-03-14 23:24:20 UTC (rev 15490)
@@ -442,7 +442,7 @@
 
   // Check if the mapset is in use
   QString gisBase = getenv( "GISBASE" );
-  if ( gisBase.isNull() ) return QObject::tr( "GISBASE is not set." );
+  if ( gisBase.isEmpty() ) return QObject::tr( "GISBASE is not set." );
 
   QFileInfo fi( mapsetPath + "/WIND" );
   if ( !fi.exists() )
@@ -1104,7 +1104,7 @@
   QString cmd = QgsApplication::prefixPath() + "/" QGIS_LIBEXEC_SUBDIR "/grass/modules/qgis.g.info";
 
   arguments.append( "info=" + info );
-  if ( !map.isNull() )
+  if ( !map.isEmpty() )
   {
     QString opt;
     switch ( type )
@@ -1138,8 +1138,8 @@
   try
   {
     QString wkt = QgsGrass::getInfo( "proj", gisdbase, location );
+    QgsDebugMsg( "wkt: " + wkt );
     crs.createFromWkt( wkt );
-
   }
   catch ( QgsGrass::Exception &e )
   {