diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-30 17:23:41 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:17 +0000 |
commit | d5bffb5125da23718e8098441b4a4269a5cf2f33 (patch) | |
tree | 48a39ba7f833116cba7dcc7917d13d34a062949c /src/core/location_provider_qt.h | |
parent | 789f375411b542db3ac3be79cbe0a6153720abf1 (diff) |
Basic adaptations for 64-based
Change-Id: I11e2da206e4e59872a38c178f57a5879c1bbf229
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/location_provider_qt.h')
-rw-r--r-- | src/core/location_provider_qt.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/location_provider_qt.h b/src/core/location_provider_qt.h index b1ff354a0..5c59b07ed 100644 --- a/src/core/location_provider_qt.h +++ b/src/core/location_provider_qt.h @@ -42,8 +42,8 @@ #include <QtCore/qcompilerdetection.h> -#include "device/geolocation/geoposition.h" -#include "device/geolocation/location_provider.h" +#include "device/geolocation/public/cpp/geoposition.h" +#include "device/geolocation/public/cpp/location_provider.h" QT_FORWARD_DECLARE_CLASS(QThread) @@ -61,18 +61,18 @@ public: virtual ~LocationProviderQt(); // LocationProvider - bool StartProvider(bool high_accuracy) override; + void StartProvider(bool high_accuracy) override; void StopProvider() override; - const device::Geoposition& GetPosition() override { return m_lastKnownPosition; } + const device::mojom::Geoposition& GetPosition() override { return m_lastKnownPosition; } void OnPermissionGranted() override; void SetUpdateCallback(const LocationProviderUpdateCallback& callback) override; private: friend class QtPositioningHelper; - void updatePosition(const device::Geoposition &); + void updatePosition(const device::mojom::Geoposition &); - device::Geoposition m_lastKnownPosition; + device::mojom::Geoposition m_lastKnownPosition; LocationProviderUpdateCallback m_callback; QtPositioningHelper *m_positioningHelper; }; |