Debug stream code cleanup/unification

src/GUI/margins.cpp

@@ -1,9 +0,0 @@
-#include "margins.h"
-
-
-QDebug operator<<(QDebug dbg, const MarginsF &margins)
-{
-	dbg.nospace() << "MarginsF(" << margins.left() << ", " << margins.top()
-	  << ", " << margins.right() << margins.bottom() << ")";
-	return dbg.maybeSpace();
-}

src/GUI/margins.h

@@ -25,6 +25,11 @@ private:
 	qreal _left, _top, _right, _bottom;
 };
 
-QDebug operator<<(QDebug dbg, const MarginsF &margins);
+inline QDebug operator<<(QDebug dbg, const MarginsF &margins)
+{
+	dbg.nospace() << "MarginsF(" << margins.left() << ", " << margins.top()
+	  << ", " << margins.right() << margins.bottom() << ")";
+	return dbg.space();
+}
 
 #endif // MARGINS_H

src/map/angularunits.cpp

@@ -37,5 +37,5 @@ AngularUnits::AngularUnits(int code)
 QDebug operator<<(QDebug dbg, const AngularUnits &au)
 {
 	dbg.nospace() << "AngularUnits(" << deg2rad(au._f) << ")";
-	return dbg.maybeSpace();
+	return dbg.space();
 }

src/map/datum.cpp

@@ -61,7 +61,7 @@ Coordinates Datum::fromWGS84(const Coordinates &c) const
 
 QDebug operator<<(QDebug dbg, const Datum &datum)
 {
-	dbg.nospace() << "Datum(" << *datum.ellipsoid() << ", " << datum.dx() << ", "
+	dbg.nospace() << "Datum(" << *datum.ellipsoid() << ", " << datum.dx()
-	  << datum.dy() << ", " << datum.dz() << ")";
+	  << ", " << datum.dy() << ", " << datum.dz() << ")";
-	return dbg.maybeSpace();
+	return dbg.space();
 }

src/map/ellipsoid.cpp

@@ -70,5 +70,5 @@ QDebug operator<<(QDebug dbg, const Ellipsoid &ellipsoid)
 {
 	dbg.nospace() << "Ellipsoid(" << ellipsoid.radius() << ", "
 	  << 1.0 / ellipsoid.flattening() << ")";
-	return dbg.maybeSpace();
+	return dbg.space();
 }

src/map/gcs.cpp

@@ -187,5 +187,5 @@ QDebug operator<<(QDebug dbg, const GCS &gcs)
 {
 	dbg.nospace() << "GCS(" << gcs.datum() << ", " << gcs.primeMeridian()
 	  << ", " << gcs.angularUnits() << ")";
-	return dbg.maybeSpace();
+	return dbg.space();
 }

src/map/linearunits.cpp

@@ -23,5 +23,5 @@ LinearUnits::LinearUnits(int code)
 QDebug operator<<(QDebug dbg, const LinearUnits &lu)
 {
 	dbg.nospace() << "LinearUnits(" << lu._f << ")";
-	return dbg.maybeSpace();
+	return dbg.space();
 }

src/map/primemeridian.cpp

@@ -69,5 +69,5 @@ double PrimeMeridian::fromGreenwich(double val) const
 QDebug operator<<(QDebug dbg, const PrimeMeridian &pm)
 {
 	dbg.nospace() << "PrimeMeridian(" << pm._pm << ")";
-	return dbg.maybeSpace();
+	return dbg.space();
 }

src/map/projection.cpp

@@ -66,11 +66,11 @@ QDebug operator<<(QDebug dbg, const Projection::Setup &setup)
 	  << setup.longitudeOrigin() << ", " << setup.scale() << ", "
 	  << setup.falseEasting() << ", " << setup.falseNorthing() << ", "
 	  << setup.standardParallel1() << ", " << setup.standardParallel2() << ")";
-	return dbg.maybeSpace();
+	return dbg.space();
 }
 
 QDebug operator<<(QDebug dbg, const Projection::Method &method)
 {
 	dbg.nospace() << "Method(" << method.id() << ")";
-	return dbg.maybeSpace();
+	return dbg.space();
 }

src/map/tile.h

@@ -24,7 +24,7 @@ private:
 inline QDebug operator<<(QDebug dbg, const Tile &tile)
 {
 	dbg.nospace() << "Tile(" << tile.zoom() << ", " << tile.xy() << ")";
-	return dbg.maybeSpace();
+	return dbg.space();
 }
 
 #endif // TILE_H

src/map/transform.cpp

@@ -76,5 +76,5 @@ Transform::Transform(const QList<ReferencePoint> &points)
 QDebug operator<<(QDebug dbg, const ReferencePoint &p)
 {
 	dbg.nospace() << "ReferencePoint(" << p.xy << ", " << p.pp << ")";
-	return dbg.maybeSpace();
+	return dbg.space();
 }