src/plugins/grass/modules/r.sunmask.date.time.qgm

@@ -2,7 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Calculate shadow maps from sun position determinated by date/time" module="r.sunmask">
-	<option key="elev" />
+	<option key="elevation" />
 	<option key="year" />
 	<option key="month" />
 	<option key="day" />

src/plugins/grass/modules/r.sunmask.position.qgm

@@ -2,9 +2,9 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Calculate shadow maps from exact sun position" module="r.sunmask">
-	<option key="elev" />
+	<option key="elevation" />
 	<option key="altitude" />
 	<option key="azimuth" />
 	<flag key="z" answer="off"/>
 	<option key="output" />
-</qgisgrassmodule>
+</qgisgrassmodule>

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 );