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

[svn_qgis at osgeo.org]

Author: rugginoso
Date: 2009-07-20 17:32:49 -0400 (Mon, 20 Jul 2009)
New Revision: 11123

Modified:
   trunk/qgis/src/plugins/grass/qgsgrassshell.cpp
Log:
- Changed the GRASS Shell to determine the grass executable in runtime.
- Cutted off unnecessary includes.


Modified: trunk/qgis/src/plugins/grass/qgsgrassshell.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassshell.cpp	2009-07-20 18:19:55 UTC (rev 11122)
+++ trunk/qgis/src/plugins/grass/qgsgrassshell.cpp	2009-07-20 21:32:49 UTC (rev 11123)
@@ -14,14 +14,10 @@
  ***************************************************************************/
 #include <QTabWidget>
 #include <QVBoxLayout>
-#include <QPushButton>
 #include <QShortcut>
 #include <QKeySequence>
-#include <QSizePolicy>
 
-#include "qgsgrasstools.h"
 #include "qtermwidget/qtermwidget.h"
-#include "qgsapplication.h"
 #include "qgsgrass.h"
 
 #include "qgsgrassshell.h"
@@ -83,7 +79,7 @@
   QStringList env("");
   QStringList args("");
 
-  QString shellProgram = QString("/usr/bin/grass%1%2").arg(QgsGrass::versionMajor()).arg(QgsGrass::versionMinor());
+  QString shellProgram = QString("%1/etc/Init.sh").arg(::getenv("GISBASE"));
 
   terminal->setShellProgram(shellProgram);
   env << "TERM=vt100";