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

brushtyler · alexbruy · commit 3b961004d06a · 2012-02-16T11:30:42.000+02:00
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -2589,13 +2589,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
`@@ -2589,13 +2589,13 @@ QStringList QgsGrassModuleInput::options()`
`2589`	`2589`	`}`
`2590`	`2590`	`}`
`2591`	`2591`
`2592`		`- if ( !mGeometryTypeOption.isNull() && current < mGeometryTypes.size() )`
	`2592`	`+ if ( !mGeometryTypeOption.isEmpty() && current < mGeometryTypes.size() )`
`2593`	`2593`	`{`
`2594`	`2594`	`opt = mGeometryTypeOption + "=" + mGeometryTypes[current] ;`
`2595`	`2595`	`list.push_back( opt );`
`2596`	`2596`	`}`
`2597`	`2597`
`2598`		`- if ( !mVectorLayerOption.isNull() && current < mVectorLayerNames.size() )`
	`2598`	`+ if ( !mVectorLayerOption.isEmpty() && current < mVectorLayerNames.size() )`
`2599`	`2599`	`{`
`2600`	`2600`	`opt = mVectorLayerOption + "=" + mVectorLayerNames[current] ;`
`2601`	`2601`	`list.push_back( opt );`