Merge branch 'master' into error_procedur

[situare] / src / gps / gpsposition.h

diff --git a/src/gps/gpsposition.h b/src/gps/gpsposition.h
index b93e1a3..be69bf1 100644 (file)
--- a/src/gps/gpsposition.h
+++ b/src/gps/gpsposition.h
@@ -48,13 +48,6 @@ public:
     GPSPosition(QObject *parent = 0);
 
     /**
-    * @brief Destructor.
-    *
-    * Stops GPS.
-    */
-    ~GPSPosition();
-
-    /**
     * @brief GPS position mode.
     */
     enum Mode {Default, Simulation};
@@ -64,6 +57,13 @@ public:
 ******************************************************************************/
 public:
     /**
+    * @brief Returns is GPS initialized.
+    *
+    * @return true if initialized, false otherwise
+    */
+    bool isInitialized();
+
+    /**
     * @brief Checks if GPS is running.
     *
     * @return true if GPS running, false otherwise
@@ -106,12 +106,6 @@ public:
     */
     void stop();
 
-private slots:
-    /**
-    * @brief Slot for GPS update request.
-    */
-    virtual void update();
-
 /******************************************************************************
 * SIGNALS
 ******************************************************************************/
@@ -119,9 +113,9 @@ signals:
     /**
     * @brief Signal for error.
     *
-    * @param message error message
+    * @param error error code
     */
-    void error(const QString &message);
+    void error(const int error);
 
     /**
     * @brief Signal for position information.