new version

[googlelatitude] / src / gps.h

diff --git a/src/gps.h b/src/gps.h
index 45c9cbb..ca5ea9d 100644 (file)
--- a/src/gps.h
+++ b/src/gps.h
@@ -1,8 +1,6 @@
 #ifndef GPS_H
 #define GPS_H
 
 #ifndef GPS_H
 #define GPS_H
 

-#ifdef LIBLOCATION
-

 #include <QObject>
 
 extern "C" {
 #include <QObject>
 
 extern "C" {

@@ -14,21 +12,13 @@ class GpsMaemo5 : public QObject {
     Q_OBJECT
 
 signals:
     Q_OBJECT
 
 signals:

-    void getOK();
-    void getOK_acwp();
-    void getOK_agnss();
-
-public slots:
-    void get_acwp();
-    void get_agnss();
+    void fix();

 
 public:
     GpsMaemo5(QObject *parent = 0);
     double get_lat() { return latitude; }
     double get_lon() { return longitude; }
     double get_acc() { return accuracy; }
 
 public:
     GpsMaemo5(QObject *parent = 0);
     double get_lat() { return latitude; }
     double get_lon() { return longitude; }
     double get_acc() { return accuracy; }

-    void stop();
-    void restart();

     friend void GpsMaemo5_changed(LocationGPSDevice *device, GpsMaemo5 *gps);
 
 private:
     friend void GpsMaemo5_changed(LocationGPSDevice *device, GpsMaemo5 *gps);
 
 private:

@@ -36,15 +26,11 @@ private:
     double longitude;
     double accuracy;
 
     double longitude;
     double accuracy;
 

-    int usegps;
-

     GMainLoop *loop;
     LocationGPSDControl *control;
     LocationGPSDevice *device;
     GMainLoop *loop;
     LocationGPSDControl *control;
     LocationGPSDevice *device;

-

 };
 
 void GpsMaemo5_changed(LocationGPSDevice *device, GpsMaemo5 *gps);
 
 };
 
 void GpsMaemo5_changed(LocationGPSDevice *device, GpsMaemo5 *gps);
 

-#endif

 #endif // GPS_H
 #endif // GPS_H