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

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-04-26 18:57:32 -0400 (Sun, 26 Apr 2009)
New Revision: 10659

Modified:
   trunk/qgis/src/providers/grass/qgsgrass.cpp
Log:
missed a file in r10659

Modified: trunk/qgis/src/providers/grass/qgsgrass.cpp
===================================================================
--- trunk/qgis/src/providers/grass/qgsgrass.cpp	2009-04-26 22:56:23 UTC (rev 10658)
+++ trunk/qgis/src/providers/grass/qgsgrass.cpp	2009-04-26 22:57:32 UTC (rev 10659)
@@ -95,16 +95,12 @@
 #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 ) )
@@ -119,11 +115,8 @@
 #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() );
+    QgsDebugMsg( QString( "GRASS gisBase from configure is: %1" ).arg( gisBase ) );
 #endif
-
-#endif
   }
 
   bool userGisbase = false;
@@ -173,9 +166,7 @@
     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];