1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-10-06 14:53:21 +02:00

Fixed QT4 build

This commit is contained in:
Martin Tůma 2017-08-15 15:13:34 +02:00
parent a45125be9a
commit 797fd7f02b
9 changed files with 9 additions and 29 deletions

View File

@ -19,11 +19,9 @@ qreal Coordinates::distanceTo(const Coordinates &c) const
QDebug operator<<(QDebug dbg, const Coordinates &coordinates) QDebug operator<<(QDebug dbg, const Coordinates &coordinates)
{ {
const bool ais = dbg.autoInsertSpaces();
dbg.nospace() << "Coordinates(" << coordinates.lon() << ", " dbg.nospace() << "Coordinates(" << coordinates.lon() << ", "
<< coordinates.lat() << ")"; << coordinates.lat() << ")";
dbg.setAutoInsertSpaces(ais); return dbg.space();
return dbg.maybeSpace();
} }
QPair<Coordinates, Coordinates> Coordinates::boundingRect(qreal distance) const QPair<Coordinates, Coordinates> Coordinates::boundingRect(qreal distance) const

View File

@ -2,9 +2,7 @@
QDebug operator<<(QDebug dbg, const GraphPoint &point) QDebug operator<<(QDebug dbg, const GraphPoint &point)
{ {
const bool ais = dbg.autoInsertSpaces();
dbg.nospace() << "GraphPoint(" << point.s() << ", " << point.t() << ", " dbg.nospace() << "GraphPoint(" << point.s() << ", " << point.t() << ", "
<< point.y() << ")"; << point.y() << ")";
dbg.setAutoInsertSpaces(ais); return dbg.space();
return dbg.maybeSpace();
} }

View File

@ -118,8 +118,6 @@ void Matrix::zeroize()
QDebug operator<<(QDebug dbg, const Matrix &matrix) QDebug operator<<(QDebug dbg, const Matrix &matrix)
{ {
const bool ais = dbg.autoInsertSpaces();
dbg.nospace() << "Matrix(" << endl; dbg.nospace() << "Matrix(" << endl;
for (size_t i = 0; i < matrix.h(); i++) { for (size_t i = 0; i < matrix.h(); i++) {
for (size_t j = 0; j < matrix.w(); j++) for (size_t j = 0; j < matrix.w(); j++)
@ -128,7 +126,5 @@ QDebug operator<<(QDebug dbg, const Matrix &matrix)
} }
dbg << ")"; dbg << ")";
dbg.setAutoInsertSpaces(ais); return dbg.space();
return dbg.maybeSpace();
} }

View File

@ -39,9 +39,7 @@ void Palette::reset()
QDebug operator<<(QDebug dbg, const Palette &palette) QDebug operator<<(QDebug dbg, const Palette &palette)
{ {
const bool ais = dbg.autoInsertSpaces();
dbg.nospace() << "Palette(" << palette.color() << ", " << palette.shift() dbg.nospace() << "Palette(" << palette.color() << ", " << palette.shift()
<< ")"; << ")";
dbg.setAutoInsertSpaces(ais); return dbg.space();
return dbg.maybeSpace();
} }

View File

@ -14,9 +14,7 @@ RectC Path::boundingRect() const
QDebug operator<<(QDebug dbg, const PathPoint &point) QDebug operator<<(QDebug dbg, const PathPoint &point)
{ {
const bool ais = dbg.autoInsertSpaces();
dbg.nospace() << "PathPoint(" << point.distance() << ", " dbg.nospace() << "PathPoint(" << point.distance() << ", "
<< point.coordinates() << ")"; << point.coordinates() << ")";
dbg.setAutoInsertSpaces(ais); return dbg.space();
return dbg.maybeSpace();
} }

View File

@ -10,8 +10,6 @@ void RangeF::resize(qreal size)
QDebug operator<<(QDebug dbg, const RangeF &range) QDebug operator<<(QDebug dbg, const RangeF &range)
{ {
const bool ais = dbg.autoInsertSpaces();
dbg.nospace() << "RangeF(" << range.min() << ", " << range.max() << ")"; dbg.nospace() << "RangeF(" << range.min() << ", " << range.max() << ")";
dbg.setAutoInsertSpaces(ais); return dbg.space();
return dbg.maybeSpace();
} }

View File

@ -58,8 +58,6 @@ void RectC::unite(const Coordinates &c)
QDebug operator<<(QDebug dbg, const RectC &rect) QDebug operator<<(QDebug dbg, const RectC &rect)
{ {
const bool ais = dbg.autoInsertSpaces();
dbg.nospace() << "RectC(" << rect.topLeft() << ", " << rect.size() << ")"; dbg.nospace() << "RectC(" << rect.topLeft() << ", " << rect.size() << ")";
dbg.setAutoInsertSpaces(ais); return dbg.space();
return dbg.maybeSpace();
} }

View File

@ -2,11 +2,9 @@
QDebug operator<<(QDebug dbg, const Trackpoint &trackpoint) QDebug operator<<(QDebug dbg, const Trackpoint &trackpoint)
{ {
const bool ais = dbg.autoInsertSpaces();
dbg.nospace() << "Trackpoint(" << trackpoint.coordinates() << ", " dbg.nospace() << "Trackpoint(" << trackpoint.coordinates() << ", "
<< trackpoint.timestamp() << ", " << trackpoint.elevation() << ", " << trackpoint.timestamp() << ", " << trackpoint.elevation() << ", "
<< trackpoint.speed() << ", " << trackpoint.heartRate() << ", " << trackpoint.speed() << ", " << trackpoint.heartRate() << ", "
<< trackpoint.temperature() << ")"; << trackpoint.temperature() << ")";
dbg.setAutoInsertSpaces(ais); return dbg.space();
return dbg.maybeSpace();
} }

View File

@ -2,9 +2,7 @@
QDebug operator<<(QDebug dbg, const Waypoint &waypoint) QDebug operator<<(QDebug dbg, const Waypoint &waypoint)
{ {
const bool ais = dbg.autoInsertSpaces();
dbg.nospace() << "Waypoint(" << waypoint.coordinates() << ", " dbg.nospace() << "Waypoint(" << waypoint.coordinates() << ", "
<< waypoint.name() << ", " << waypoint.description() << ")"; << waypoint.name() << ", " << waypoint.description() << ")";
dbg.setAutoInsertSpaces(ais); return dbg.space();
return dbg.maybeSpace();
} }