X-Git-Url: http://git.maemo.org/git/?p=googlelatitude;a=blobdiff_plain;f=src%2Fgps.h;h=087e648f55a0d2906ae03784413fb67e6971dc23;hp=61162bf51db8934bb2636929370581af417df809;hb=b80c04a8938fa73c45b5d8a17a1c2b2aab5eab3b;hpb=ce29090aae7170fd98632deb30f609ef3d1675d6

diff --git a/src/gps.h b/src/gps.h
index 61162bf..087e648 100644
--- a/src/gps.h
+++ b/src/gps.h
@@ -1,7 +1,7 @@
 #ifndef GPS_H
 #define GPS_H
 
-#include <QObject>
+#include <QtCore>
 
 #ifdef Q_WS_MAEMO_5
 extern "C" {
@@ -10,7 +10,6 @@ extern "C" {
 }
 #else
 #include <QtNetwork>
-#include <QTimer>
 #endif // Q_WS_MAEMO_5
 
 class GpsMaemo5 : public QObject {
@@ -24,30 +23,36 @@ public:
     double get_lat() { return latitude; }
     double get_lon() { return longitude; }
     double get_acc() { return accuracy; }
-#ifdef Q_WS_MAEMO_5
-    friend void GpsMaemo5_changed(LocationGPSDevice *device, GpsMaemo5 *gps);
-#endif // Q_WS_MAEMO_5
 
+public slots:
+    void refresh();
+    void stop();
+    void forcestop();
+    int config(int i, int w, bool g);
+
+private slots:
 #ifdef Q_WS_MAEMO_5
+    friend void GpsMaemo5_changed(LocationGPSDevice *device, GpsMaemo5 *gps);
 #else
-private slots:
-    void finishedreply(QNetworkReply *r);
-    void gloc();
+    void gloc_reply(QNetworkReply *r);
 #endif // Q_WS_MAEMO_5
 
 private:
     double latitude;
     double longitude;
     double accuracy;
+    int interval;
+    int wait;
+    bool usegps;
+    bool emitfix;
+    bool stopgps;
 #ifdef Q_WS_MAEMO_5
-    GMainLoop *loop;
     LocationGPSDControl *control;
     LocationGPSDevice *device;
 #else
     QUrl urlloc;
     QNetworkAccessManager *worker;
 #endif // Q_WS_MAEMO_5
-
 };
 
 #ifdef Q_WS_MAEMO_5