X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fodometer.cpp;h=b2c84886e92a6b735a8b09e2fae2da3a145025b9;hb=c479733f090192ea0d3be3a1789113d5dda85a57;hp=740c3cc1764c151aee2bb6728d2f2e7d3b79a5a1;hpb=fa66fb373153edc684f4d575c56107b74a615a3b;p=jspeed diff --git a/src/odometer.cpp b/src/odometer.cpp index 740c3cc..b2c8488 100644 --- a/src/odometer.cpp +++ b/src/odometer.cpp @@ -34,9 +34,7 @@ namespace QString const KM_SPEEDUNIT = "km/h"; QString const MILE_SPEEDUNIT = "mph"; QString const METER_UNIT = "m"; - QString const FEET_UNIT = "feet"; - double const FEET_MULTIPLIER = 3.2808399; - double const METER_MULTIPLIER = 1.0; + QString const FEET_UNIT = "ft"; static const int FIX_TIMEOUT = 4000; double const DEFAULT_SPEED_TRESHOLD = 8.0; double const MIN_SPEED_TRESHOLD = 0.8; @@ -295,14 +293,7 @@ double Odometer::getUnitMultiplier() double Odometer::getMeterMultiplier() { - if(Location::getUnit() == Location::KM) - { - return METER_MULTIPLIER; - } - else - { - return FEET_MULTIPLIER; - } + return Location::getMeterMultiplier(); } QString Odometer::getMeterUnit()