summaryrefslogtreecommitdiff
path: root/src/imports/positioning/qdeclarativepositionsource.cpp
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@jollamobile.com>2014-02-07 11:57:53 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-10 00:42:48 +0100
commited14a2d2654d5de7ff1f8059fe576acf10f66b28 (patch)
tree83a0beefec3ddd8d48efe0be880e7555e15315b7 /src/imports/positioning/qdeclarativepositionsource.cpp
parent20ee891ec034783b09c698916fbfc2127f92c803 (diff)
downloadqtlocation-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/qdeclarativepositionsource.cpp')
-rw-r--r--src/imports/positioning/qdeclarativepositionsource.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp
index 317f03c7..fe2a3e56 100644
--- a/src/imports/positioning/qdeclarativepositionsource.cpp
+++ b/src/imports/positioning/qdeclarativepositionsource.cpp
@@ -371,18 +371,7 @@ void QDeclarativePositionSource::socketError(QAbstractSocket::SocketError error)
void QDeclarativePositionSource::setPosition(const QGeoPositionInfo &pi)
{
- if (pi.isValid()) {
- m_position.setTimestamp(pi.timestamp());
- m_position.setCoordinate(pi.coordinate());
- m_position.setSpeed(pi.attribute(QGeoPositionInfo::GroundSpeed));
- m_position.setDirection(pi.attribute(QGeoPositionInfo::Direction));
- m_position.setVerticalSpeed(pi.attribute(QGeoPositionInfo::VerticalSpeed));
- m_position.setHorizontalAccuracy(pi.attribute(QGeoPositionInfo::HorizontalAccuracy));
- m_position.setVerticalAccuracy(pi.attribute(QGeoPositionInfo::VerticalAccuracy));
- } else {
- m_position.invalidate();
- }
-
+ m_position.setPosition(pi);
emit positionChanged();
}