diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-21 14:25:41 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-27 07:23:05 +0100 |
commit | 4f45cb18669af8e11cfab6dc546e275b05ff4ab9 (patch) | |
tree | a2138a9c249315653b9e930a565e2eeef57c3cc5 /src/positioning/qgeopositioninfo.cpp | |
parent | d8d9c4fbb6047b59b98108d6e3221206aa926ccd (diff) | |
download | qtlocation-4f45cb18669af8e11cfab6dc546e275b05ff4ab9.tar.gz |
Ensure QtPositioning value types don't change QDebug spacing policy
Change-Id: I1a98df26582957b0df136e98acf5d2754fe45295
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/positioning/qgeopositioninfo.cpp')
-rw-r--r-- | src/positioning/qgeopositioninfo.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/positioning/qgeopositioninfo.cpp b/src/positioning/qgeopositioninfo.cpp index b22bc999..2fde23f9 100644 --- a/src/positioning/qgeopositioninfo.cpp +++ b/src/positioning/qgeopositioninfo.cpp @@ -249,37 +249,38 @@ bool QGeoPositionInfo::hasAttribute(Attribute attribute) const #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info) { + QDebugStateSaver saver(dbg); dbg.nospace() << "QGeoPositionInfo(" << info.d->timestamp; - dbg.nospace() << ", "; - dbg.nospace() << info.d->coord; + dbg.nospace() << ", "; // timestamp force dbg.space() -> reverting here + dbg << info.d->coord; QList<QGeoPositionInfo::Attribute> attribs = info.d->doubleAttribs.keys(); std::stable_sort(attribs.begin(), attribs.end()); // Output a sorted list from an unsorted hash. for (int i = 0; i < attribs.count(); ++i) { - dbg.nospace() << ", "; + dbg << ", "; switch (attribs[i]) { case QGeoPositionInfo::Direction: - dbg.nospace() << "Direction="; + dbg << "Direction="; break; case QGeoPositionInfo::GroundSpeed: - dbg.nospace() << "GroundSpeed="; + dbg << "GroundSpeed="; break; case QGeoPositionInfo::VerticalSpeed: - dbg.nospace() << "VerticalSpeed="; + dbg << "VerticalSpeed="; break; case QGeoPositionInfo::MagneticVariation: - dbg.nospace() << "MagneticVariation="; + dbg << "MagneticVariation="; break; case QGeoPositionInfo::HorizontalAccuracy: - dbg.nospace() << "HorizontalAccuracy="; + dbg << "HorizontalAccuracy="; break; case QGeoPositionInfo::VerticalAccuracy: - dbg.nospace() << "VerticalAccuracy="; + dbg << "VerticalAccuracy="; break; } - dbg.nospace() << info.d->doubleAttribs[attribs[i]]; + dbg << info.d->doubleAttribs[attribs[i]]; } - dbg.nospace() << ')'; + dbg << ')'; return dbg; } #endif |