--- a/qtmobility/src/location/qgeopositioninfosource_maemo_p.h	Fri May 14 16:41:33 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfosource_maemo_p.h	Thu May 27 13:42:11 2010 +0300
@@ -45,12 +45,25 @@
 #include "qgeopositioninfosource.h"
 #include "dbuscomm_maemo_p.h"
 
+#ifdef Q_WS_MAEMO_5
+#include "qgeocoordinate.h"
+
+extern "C" {
+   #include <glib.h>
+   #include <location/location-gpsd-control.h>
+   #include <location/location-gps-device.h>
+   #include <location/location-misc.h>
+   #include <location/location-distance-utils.h>
+}
+#endif
+
 QTM_BEGIN_NAMESPACE
 
 class DBusComm;
 class QGeoPositionInfoSourceMaemo : public QGeoPositionInfoSource
 {
     Q_OBJECT
+
 public:
 
     QGeoPositionInfoSourceMaemo(QObject *parent = 0);
@@ -58,29 +71,25 @@
 
     virtual void setUpdateInterval(int interval);
     virtual void setPreferredPositioningMethods(PositioningMethods sources);
-    //virtual QPositioninfo QGeoPositionInfoSource::lastUpdate(QFlags<QGeoPositionInfoSource::PositionSourceType>) const;
     virtual QGeoPositionInfo lastKnownPosition(bool fromSatellitePositioningMethodsOnly = false) const;
     virtual PositioningMethods supportedPositioningMethods() const;
     virtual int minimumUpdateInterval() const;
 
-private:
-    void dumpNMEA(const char *msg);
-    DBusComm* dbusComm;
-    QGeoPositionInfo lastUpdate;
-    QGeoPositionInfo lastSatUpdate;
-    bool validLastUpdate;
-    bool validLastSatUpdate;
-    static const int MinimumUpdateInterval = 1000;
-    int time_interval_;
-    int distance_interval_;
-    bool registered_;
-    PositioningMethods availableMethods;
-
-public slots:
+public Q_SLOTS:
     void startUpdates();
     void stopUpdates();
     void requestUpdate(int timeout = 5000);
-    void dbusMessages(const QByteArray &msg);
+
+private:
+    static const int MinimumUpdateInterval = 1000;
+    static const int DefaultUpdateInterval = 5000;
+
+    DBusComm* dbusComm;
+
+    int time_interval_;
+    PositioningMethods availableMethods;
+
+private Q_SLOTS:
     void newPositionUpdate(const QGeoPositionInfo &update);
 };