Bugfix: top results unit km/h -> s and routedialog max speed

[speedfreak] / Client / maemo5locationprivate.cpp

diff --git a/Client/maemo5locationprivate.cpp b/Client/maemo5locationprivate.cpp
index 5e4374a..d8b3b5d 100755 (executable)
--- a/Client/maemo5locationprivate.cpp
+++ b/Client/maemo5locationprivate.cpp
@@ -62,7 +62,7 @@ void Maemo5LocationPrivate::get_agnss()
 }
 
 /**
-  *Stop pollling
+  *Stop polling gps
   */
 void Maemo5LocationPrivate::stop()
 {
@@ -123,23 +123,23 @@ void gps_error_func(LocationGPSDControl *control, gint error, Maemo5LocationPriv
 
     switch (error) {
       case LOCATION_ERROR_USER_REJECTED_DIALOG:
-        emit gps->gps_err(0);
+        emit gps->gps_error(0);
         g_debug("User didn't enable requested methods");
         break;
       case LOCATION_ERROR_USER_REJECTED_SETTINGS:
-        emit gps->gps_err(1);
+        emit gps->gps_error(1);
         g_debug("User changed settings, which disabled location");
         break;
       case LOCATION_ERROR_BT_GPS_NOT_AVAILABLE:
-        emit gps->gps_err(2);
+        emit gps->gps_error(2);
         g_debug("Problems with BT GPS");
         break;
       case LOCATION_ERROR_METHOD_NOT_ALLOWED_IN_OFFLINE_MODE:
-        emit gps->gps_err(3);
+        emit gps->gps_error(3);
         g_debug("Requested method is not allowed in offline mode");
         break;
       case LOCATION_ERROR_SYSTEM:
-        emit gps->gps_err(4);
+        emit gps->gps_error(4);
         g_debug("System error");
         break;
       }
@@ -180,7 +180,7 @@ void gps_data_changed(LocationGPSDevice *device, Maemo5LocationPrivate *gps)
             gps->satellites_in_use = gps->device->satellites_in_use;
             gps->satellites_in_view = gps->device->satellites_in_view;
 
-            if(gps->device->fix->fields &       LOCATION_GPS_DEVICE_TIME_SET)
+            if(gps->device->fix->fields & LOCATION_GPS_DEVICE_TIME_SET)
             {
                 gps->time = gps->device->fix->time;
                 gps->ept = gps->device->fix->ept;
@@ -217,7 +217,7 @@ void gps_data_changed(LocationGPSDevice *device, Maemo5LocationPrivate *gps)
             {
                 for(int i=0 ; i < gps->satellites_in_use ; i++)
                 {
-                    LocationGPSDeviceSatellite * view = (LocationGPSDeviceSatellite*) g_ptr_array_index (gps->device->satellites, i);
+                    LocationGPSDeviceSatellite *view = (LocationGPSDeviceSatellite*) g_ptr_array_index (gps->device->satellites, i);
                     temp = temp + view->signal_strength;
                 }
                 gps->signal_strength = (temp / gps->satellites_in_use);