Change to using UnitTypes, part deux

Author: homann

src/app/qgsmaptoolidentify.cpp

@@ -392,17 +392,7 @@ void QgsMapToolIdentify::convertMeasurement( QgsDistanceArea &calc, double &meas
 
   // Get the units for display
   QSettings settings;
-  QString myDisplayUnitsTxt = settings.value( "/qgis/measure/displayunits", "meters" ).toString();
-
-  QGis::UnitType displayUnits;
-  if ( myDisplayUnitsTxt == "feet" )
-  {
-    displayUnits = QGis::Feet;
-  }
-  else
-  {
-    displayUnits = QGis::Meters;
-  }
+  QGis::UnitType displayUnits = QGis::fromLiteral( settings.value( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) ).toString() );
 
   calc.convertMeasurement( measure, myUnits, displayUnits, isArea );
   u = myUnits;

src/app/qgsoptions.cpp

@@ -298,8 +298,8 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   }
 
   // Set the units for measuring
-  QString myUnitsTxt = QGis::fromLiteral( settings.value( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) ).toString() );
-  if ( myUnitsTxt == QGis::Feet )
+  QGis::UnitType myDisplayUnits = QGis::fromLiteral( settings.value( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) ).toString() );
+  if ( myDisplayUnits == QGis::Feet )
   {
     radFeet->setChecked( true );
   }
@@ -948,7 +948,7 @@ void QgsOptions::saveOptions()
   }
   else
   {
-    settings.setValue( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Feet ) );
+    settings.setValue( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) );
   }
 
   QString angleUnitString = "degrees";