FCL/sf/mw/qtextensions: comparison qtmobility/src/location/qgeopositioninfo.cpp

equal deleted inserted replaced

-:2b40d63a9c3d
+:90517678cc4f
 QTM_BEGIN_NAMESPACE
 class QGeoPositionInfoPrivate
 {
 public:
-QDateTime dateTime;
+QDateTime timestamp;
 QGeoCoordinate coord;
 QHash<int, qreal> doubleAttribs;
 };
 /*!
 : d(new QGeoPositionInfoPrivate)
 {
 }
 /*!
-Creates a QGeoPositionInfo for the given \a coordinate and \a dateTime.
+Creates a QGeoPositionInfo for the given \a coordinate and \a timestamp.
 */
-QGeoPositionInfo::QGeoPositionInfo(const QGeoCoordinate &coordinate, const QDateTime &dateTime)
+QGeoPositionInfo::QGeoPositionInfo(const QGeoCoordinate &coordinate, const QDateTime &timestamp)
 : d(new QGeoPositionInfoPrivate)
 {
-d->dateTime = dateTime;
+d->timestamp = timestamp;
 d->coord = coordinate;
 }
 /*!
 Creates a QGeoPositionInfo with the values of \a other.
 QGeoPositionInfo &QGeoPositionInfo::operator=(const QGeoPositionInfo & other)
 {
 if (this == &other)
 return *this;
-d->dateTime = other.d->dateTime;
+d->timestamp = other.d->timestamp;
 d->coord = other.d->coord;
 d->doubleAttribs = other.d->doubleAttribs;
 return *this;
 }
 Returns true if all of this object's values are the same as those of
 \a other.
 */
 bool QGeoPositionInfo::operator==(const QGeoPositionInfo &other) const
 {
-return d->dateTime == other.d->dateTime
+return d->timestamp == other.d->timestamp
 && d->coord == other.d->coord
 && d->doubleAttribs == other.d->doubleAttribs;
 }
 /*!
 Returns true if any of this object's values are not the same as those of
 \a other.
 */
 /*!
-Returns true if the dateTime() and coordinate() values are both valid.
+Returns true if the timestamp() and coordinate() values are both valid.
 \sa QGeoCoordinate::isValid(), QDateTime::isValid()
 */
 bool QGeoPositionInfo::isValid() const
 {
-return d->dateTime.isValid() && d->coord.isValid();
+return d->timestamp.isValid() && d->coord.isValid();
 }
 /*!
-Sets the date and time at which this position was reported to \a dateTime.
+Sets the date and time at which this position was reported to \a timestamp.
-The \a dateTime must be in UTC time.
+The \a timestamp must be in UTC time.
-\sa dateTime()
+\sa timestamp()
 */
-void QGeoPositionInfo::setDateTime(const QDateTime &dateTime)
+void QGeoPositionInfo::setTimestamp(const QDateTime &timestamp)
 {
-d->dateTime = dateTime;
+d->timestamp = timestamp;
 }
 /*!
 Returns the date and time at which this position was reported, in UTC time.
 Returns an invalid QDateTime if no date/time value has been set.
-\sa setDateTime()
+\sa setTimestamp()
 */
-QDateTime QGeoPositionInfo::dateTime() const
+QDateTime QGeoPositionInfo::timestamp() const
 {
-return d->dateTime;
+return d->timestamp;
 }
 /*!
 Sets the coordinate for this position to \a coordinate.
 }
 /*!
 Returns the value of the specified \a attribute as a qreal value.
-Returns -1 if the value has not been set.
+Returns -1 if the value has not been set, although this may also
+be a legitimate value for some attributes.
+The function hasAttribute() should be used to determine whether or
+not a value has been set for an attribute.
 \sa hasAttribute(), setAttribute()
 */
 qreal QGeoPositionInfo::attribute(Attribute attribute) const
 {
 {
 return d->doubleAttribs.contains(int(attribute));
 }
 #ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QGeoPositionInfo &update)
+QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info)
 {
-dbg.nospace() << "QGeoPositionInfo(" << update.d->dateTime;
+dbg.nospace() << "QGeoPositionInfo(" << info.d->timestamp;
 dbg.nospace() << ", ";
-dbg.nospace() << update.d->coord;
+dbg.nospace() << info.d->coord;
-QList<int> attribs = update.d->doubleAttribs.keys();
+QList<int> attribs = info.d->doubleAttribs.keys();
 for (int i = 0; i < attribs.count(); i++) {
 dbg.nospace() << ", ";
 switch (attribs[i]) {
 case QGeoPositionInfo::Direction:
 dbg.nospace() << "Direction=";
 break;
 case QGeoPositionInfo::VerticalAccuracy:
 dbg.nospace() << "VerticalAccuracy=";
 break;
 }
-dbg.nospace() << update.d->doubleAttribs[attribs[i]];
+dbg.nospace() << info.d->doubleAttribs[attribs[i]];
 }
 dbg.nospace() << ')';
 return dbg;
 }
 #endif
 \sa {Format of the QDataStream Operators}
 */
 QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info)
 {
-stream << info.d->dateTime;
+stream << info.d->timestamp;
 stream << info.d->coord;
 stream << info.d->doubleAttribs;
 return stream;
 }
 #endif
 \sa {Format of the QDataStream Operators}
 */
 QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info)
 {
-stream >> info.d->dateTime;
+stream >> info.d->timestamp;
 stream >> info.d->coord;
 stream >> info.d->doubleAttribs;
 return stream;
 }
 #endif

changeset 4	90517678cc4f
parent 1	2b40d63a9c3d
child 11	06b8e2af4411