Conflict fixed: mainwindow.cpp and httpclient.cpp

[speedfreak] / Client / gpsdata.cpp

diff --git a/Client/gpsdata.cpp b/Client/gpsdata.cpp
index db0a6bc..eca9efb 100644 (file)
--- a/Client/gpsdata.cpp
+++ b/Client/gpsdata.cpp
@@ -7,12 +7,14 @@
  */
 
 #include "gpsdata.h"
+#include <QDebug>
 
 /**
   *Default constructor of this class.
   */
 GPSData::GPSData(Maemo5Location *maemo5location)
 {
+    qDebug() << "__GPSData";
     location = maemo5location;
 
     connect(location,SIGNAL(agnss()),this,SLOT(agnss()));
@@ -33,10 +35,16 @@ GPSData::GPSData(Maemo5Location *maemo5location)
   */
 GPSData::~GPSData()
 {
-    delete location;
-    delete gpsDateTime;
+    qDebug() << "__~GPSData";
+    location = NULL;
+
+    if(gpsDateTime)
+        delete gpsDateTime;
 }
 
+/**
+  * This function reset all variables
+  */
 void GPSData::resetAll()
 {
     satellitesInUse = 0;