Added custom button for users dialog and changed place of www-button. Www-button...

[speedfreak] / Client / maemo5locationprivate.cpp

diff --git a/Client/maemo5locationprivate.cpp b/Client/maemo5locationprivate.cpp
index 5e4374a..8935c8d 100755 (executable)
--- a/Client/maemo5locationprivate.cpp
+++ b/Client/maemo5locationprivate.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "maemo5locationprivate.h"
+#include <QDebug>
 
 /**
   *Default constructor of this class.
@@ -14,13 +15,16 @@
   */
 Maemo5LocationPrivate::Maemo5LocationPrivate(Maemo5Location* location):QObject(location)
 {
+    qDebug() << "__Maemo5LocationPrivate";
     //Initialize variables
     gps_online = false;
     usegps = -1;
     resetAll();
     //Get gps control object
+    control = NULL;
     control = location_gpsd_control_get_default();
     //create gps device
+    device = NULL;
     device = (LocationGPSDevice*) g_object_new(LOCATION_TYPE_GPS_DEVICE, NULL);
 
     g_signal_connect(device, "changed", G_CALLBACK(gps_data_changed), this);
@@ -37,8 +41,9 @@ Maemo5LocationPrivate::Maemo5LocationPrivate(Maemo5Location* location):QObject(l
   */
 Maemo5LocationPrivate::~Maemo5LocationPrivate()
 {
-    delete device;
-    delete control;
+    qDebug() << "__~Maemo5LocationPrivate";
+    //delete device;
+    //delete control;
 }
 
 /**
@@ -62,7 +67,7 @@ void Maemo5LocationPrivate::get_agnss()
 }
 
 /**
-  *Stop pollling
+  *Stop polling gps
   */
 void Maemo5LocationPrivate::stop()
 {
@@ -123,23 +128,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 +185,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 +222,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);