mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
fc812ea130
Fix multiple run-time errors in connect call introduced in 504e912512.
1) Set the proper signature of the signal. 2) make the used slot
a real slot (so move it to the proper section in the header) and
3) set the proper signature for the slot.
Highly unlikely that normal users notice the runtime errors and
possibly unwantend behavior, as this all deals with the subtile GPS
service update threshold.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
75 lines
1.8 KiB
C++
75 lines
1.8 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef GPSLOCATION_H
|
|
#define GPSLOCATION_H
|
|
|
|
#include "units.h"
|
|
#include <QObject>
|
|
#include <QGeoCoordinate>
|
|
#include <QGeoPositionInfoSource>
|
|
#include <QGeoPositionInfo>
|
|
#include <QSettings>
|
|
#include <QNetworkReply>
|
|
#include <QMap>
|
|
|
|
#define GPS_CURRENT_POS gettextFromC::tr("Waiting to aquire GPS location")
|
|
|
|
struct gpsTracker {
|
|
degrees_t latitude;
|
|
degrees_t longitude;
|
|
qint64 when;
|
|
QString name;
|
|
int idx;
|
|
};
|
|
|
|
class GpsLocation : public QObject {
|
|
Q_OBJECT
|
|
public:
|
|
GpsLocation(void (*showMsgCB)(const char *msg), QObject *parent);
|
|
~GpsLocation();
|
|
static GpsLocation *instance();
|
|
static bool hasInstance();
|
|
bool applyLocations();
|
|
int getGpsNum() const;
|
|
bool hasLocationsSource();
|
|
QString currentPosition();
|
|
|
|
QMap<qint64, gpsTracker> currentGPSInfo() const;
|
|
|
|
private:
|
|
QGeoPositionInfo lastPos;
|
|
QGeoPositionInfoSource *getGpsSource();
|
|
QGeoPositionInfoSource *m_GpsSource;
|
|
void status(QString msg);
|
|
QSettings *geoSettings;
|
|
QNetworkReply *reply;
|
|
QString userAgent;
|
|
void (*showMessageCB)(const char *msg);
|
|
static GpsLocation *m_Instance;
|
|
bool waitingForPosition;
|
|
QMap<qint64, gpsTracker> m_trackers;
|
|
QList<gpsTracker> m_deletedTrackers;
|
|
void loadFromStorage();
|
|
void addFixToStorage(gpsTracker >);
|
|
void replaceFixToStorage(gpsTracker >);
|
|
void deleteFixFromStorage(gpsTracker >);
|
|
void deleteFixesFromServer();
|
|
enum { UNKNOWN, NOGPS, HAVEGPS } haveSource;
|
|
|
|
signals:
|
|
void haveSourceChanged();
|
|
void acquiredPosition();
|
|
|
|
public slots:
|
|
void serviceEnable(bool toggle);
|
|
void newPosition(QGeoPositionInfo pos);
|
|
void updateTimeout();
|
|
void positionSourceError(QGeoPositionInfoSource::Error error);
|
|
void postError(QNetworkReply::NetworkError error);
|
|
void setGpsTimeThreshold(int seconds);
|
|
#ifdef SUBSURFACE_MOBILE
|
|
void clearGpsData();
|
|
#endif
|
|
void deleteGpsFix(qint64 when);
|
|
};
|
|
|
|
#endif // GPSLOCATION_H
|