fix #4465 to make the GRASS plugin working with GRASS 6.4.2RC2

brushtyler · brushtyler · commit a9f82d1e77cf · 2011-11-17T16:40:53.000+01:00
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -2648,13 +2648,13 @@ QStringList QgsGrassModuleInput::options()
     }
   }
 
-  if ( !mGeometryTypeOption.isNull() && current < mGeometryTypes.size() )
+  if ( !mGeometryTypeOption.isEmpty() && current < mGeometryTypes.size() )
   {
     opt = mGeometryTypeOption + "=" + mGeometryTypes[current] ;
     list.push_back( opt );
   }
 
-  if ( !mVectorLayerOption.isNull() && current < mVectorLayerNames.size() )
+  if ( !mVectorLayerOption.isEmpty() && current < mVectorLayerNames.size() )
   {
     opt = mVectorLayerOption + "=" + mVectorLayerNames[current] ;
     list.push_back( opt );

Original file line number	Diff line number	Diff line change
`@@ -2648,13 +2648,13 @@ QStringList QgsGrassModuleInput::options()`
`2648`	`2648`	`}`
`2649`	`2649`	`}`
`2650`	`2650`
`2651`		`- if ( !mGeometryTypeOption.isNull() && current < mGeometryTypes.size() )`
	`2651`	`+ if ( !mGeometryTypeOption.isEmpty() && current < mGeometryTypes.size() )`
`2652`	`2652`	`{`
`2653`	`2653`	`opt = mGeometryTypeOption + "=" + mGeometryTypes[current] ;`
`2654`	`2654`	`list.push_back( opt );`
`2655`	`2655`	`}`
`2656`	`2656`
`2657`		`- if ( !mVectorLayerOption.isNull() && current < mVectorLayerNames.size() )`
	`2657`	`+ if ( !mVectorLayerOption.isEmpty() && current < mVectorLayerNames.size() )`
`2658`	`2658`	`{`
`2659`	`2659`	`opt = mVectorLayerOption + "=" + mVectorLayerNames[current] ;`
`2660`	`2660`	`list.push_back( opt );`