diff options
| author | Aaron McCarthy <aaron.mccarthy@jollamobile.com> | 2014-02-07 11:57:53 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-10 00:42:48 +0100 |
| commit | ed14a2d2654d5de7ff1f8059fe576acf10f66b28 (patch) | |
| tree | 83a0beefec3ddd8d48efe0be880e7555e15315b7 /src/imports/positioning/qdeclarativeposition_p.h | |
| parent | 20ee891ec034783b09c698916fbfc2127f92c803 (diff) | |
| download | qtlocation-ed14a2d2654d5de7ff1f8059fe576acf10f66b28.tar.gz | |
Simplify property change logic in Position type.
Removes all member variables and replaces them with a QGeoPositionInfo.
Uses the same value changed and validity changed logic for all
properties.
Change-Id: Ic0420ce7a26da2db12c3eabcad4beac83ea332fe
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/imports/positioning/qdeclarativeposition_p.h')
| -rw-r--r-- | src/imports/positioning/qdeclarativeposition_p.h | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/src/imports/positioning/qdeclarativeposition_p.h b/src/imports/positioning/qdeclarativeposition_p.h index f109b7a7..d9235368 100644 --- a/src/imports/positioning/qdeclarativeposition_p.h +++ b/src/imports/positioning/qdeclarativeposition_p.h @@ -1,5 +1,7 @@ /**************************************************************************** ** +** Copyright (C) 2014 Jolla Ltd. +** Contact: Aaron McCarthy <aaron.mccarthy@jollamobile.com> ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** @@ -47,18 +49,12 @@ #include <QtQml/qqml.h> #include <QtPositioning/QGeoPositionInfo> -// Define this to get qDebug messages -// #define QDECLARATIVE_POSITION_DEBUG - -#ifdef QDECLARATIVE_POSITION_DEBUG -#include <QDebug> -#endif - QT_BEGIN_NAMESPACE class QDeclarativePosition : public QObject { Q_OBJECT + Q_PROPERTY(bool latitudeValid READ isLatitudeValid NOTIFY latitudeValidChanged) Q_PROPERTY(bool longitudeValid READ isLongitudeValid NOTIFY longitudeValidChanged) Q_PROPERTY(bool altitudeValid READ isAltitudeValid NOTIFY altitudeValidChanged) @@ -77,7 +73,6 @@ class QDeclarativePosition : public QObject Q_PROPERTY(double verticalSpeed READ verticalSpeed NOTIFY verticalSpeedChanged REVISION 1) public: - explicit QDeclarativePosition(QObject *parent = 0); ~QDeclarativePosition(); @@ -85,9 +80,7 @@ public: bool isLongitudeValid() const; bool isAltitudeValid() const; QDateTime timestamp() const; - void setTimestamp(const QDateTime ×tamp); double speed() const; - void setSpeed(double speed); bool isSpeedValid() const; QGeoCoordinate coordinate(); bool isHorizontalAccuracyValid() const; @@ -105,9 +98,7 @@ public: double verticalSpeed() const; void setVerticalSpeed(double speed); - // C++ - void setCoordinate(const QGeoCoordinate &coordinate); - void invalidate(); + void setPosition(const QGeoPositionInfo &info); Q_SIGNALS: void latitudeValidChanged(); @@ -128,19 +119,7 @@ Q_SIGNALS: Q_REVISION(1) void verticalSpeedChanged(); private: - bool m_latitudeValid; - bool m_longitudeValid; - bool m_altitudeValid; - QDateTime m_timestamp; - double m_speed; - bool m_speedValid; - double m_direction; - double m_verticalSpeed; - bool m_horizontalAccuracyValid; - bool m_verticalAccuracyValid; - qreal m_horizontalAccuracy; - qreal m_verticalAccuracy; - QGeoCoordinate m_coordinate; + QGeoPositionInfo m_info; }; QT_END_NAMESPACE |