[QGIS Commit] r13431 - trunk/qgis/src/plugins/grass

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-05-06 16:07:34 -0400 (Thu, 06 May 2010)
New Revision: 13431

Modified:
   trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
Log:
fix #2620

Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2010-05-06 17:22:16 UTC (rev 13430)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2010-05-06 20:07:34 UTC (rev 13431)
@@ -345,19 +345,15 @@
                           .arg( process.readAllStandardError().constData() ) );
     return;
   }
-  QByteArray gDescArray = process.readAllStandardOutput();
-  QByteArray errArray = process.readAllStandardError();
 
   QDomDocument gDoc( "task" );
   QString err;
   int line, column;
-  if ( !gDoc.setContent(( QByteArray )gDescArray, &err, &line, &column ) )
+  if ( !gDoc.setContent( &process, false, &err, &line, &column ) )
   {
     QString errmsg = tr( "Cannot read module description (%1):" ).arg( mXName )
                      + tr( "\n%1\nat line %2 column %3" ).arg( err ).arg( line ).arg( column );
     QgsDebugMsg( errmsg );
-    QgsDebugMsg( QString( gDescArray ) );
-    QgsDebugMsg( QString( errArray ) );
     QMessageBox::warning( 0, tr( "Warning" ), errmsg );
     return;
   }