Fixed remaining warnings in grass provider and plugin.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6654 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 22, 2007 · d8b2604 · d8b2604
1 parent 08f1a8c
commit d8b2604
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -601,7 +601,7 @@ void QgsGrassModuleStandardOptions::freezeOutput()
     #endif
 
 #ifdef WIN32
-    for ( int i = 0; i < mItems.size(); i++ ) 
+    for ( unsigned int i = 0; i < mItems.size(); i++ ) 
     {
 	if ( typeid(*(mItems[i])) != typeid (QgsGrassModuleOption) ) {
 	    continue;
@@ -675,7 +675,7 @@ void QgsGrassModuleStandardOptions::thawOutput()
     #endif
 
 #ifdef WIN32
-    for ( int i = 0; i < mItems.size(); i++ ) 
+    for ( unsigned int i = 0; i < mItems.size(); i++ ) 
     {
 	if ( typeid(*(mItems[i])) != typeid (QgsGrassModuleOption) ) {
 	    continue;

diff --git a/src/plugins/grass/qgsgrassshell.cpp b/src/plugins/grass/qgsgrassshell.cpp
@@ -900,14 +900,14 @@ void QgsGrassShell::mousePressEvent(QMouseEvent* e)
 
 void QgsGrassShell::resizeTerminal()
 {
+#ifndef WIN32
     int width = mText->visibleWidth(); 
     int height = mText->visibleHeight(); 
 
     QFontMetrics fm ( mFont );
     int col = (int) (width / fm.width("x")); 
     int row = (int) (height / fm.height()); 
 
-#ifndef WIN32
     struct winsize winSize;
     memset(&winSize, 0, sizeof(winSize));
     winSize.ws_row = row;

diff --git a/src/plugins/grass/qgsgrasstools.cpp b/src/plugins/grass/qgsgrasstools.cpp
@@ -172,7 +172,6 @@ void QgsGrassTools::moduleClicked( Q3ListViewItem * item )
     std::cerr << "path = " << path.ascii() << std::endl;
     #endif
     QWidget *m;
-    QgsGrassShell *sh = 0;
     if ( name == "shell" )
     {
          // Set history file

diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -412,12 +412,12 @@ QString QgsGrass::openMapset ( QString gisdbase, QString location, QString mapse
     // TODO better wait 
     while ( process->isRunning () ) { }
 
-    int status = process->exitStatus ();
-    delete process;
-
 #ifdef QGISDEBUG
+    int status = process->exitStatus ();
     std::cerr << "status = " << status << std::endl;
 #endif
+    delete process;
+
 
 // TODO WIN32 (lock.exe does not work properly?)
 #ifndef WIN32