summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <[email protected]>2016-07-12 21:47:26 +0200
committerFriedrich W. H. Kossebau <[email protected]>2016-07-12 21:47:26 +0200
commit36c9696b7bb2594dd273a48b2312f66c0b28245f (patch)
tree8197b6b85c2dc85682f55d3241cb57d0b24f09c8
parent0b69cbfb6d9677df7cc32cee7dd4701ce1917f53 (diff)
Use explicit tag with GeoDataLinearRing(const GeoDataGeometry &other)
-rw-r--r--src/lib/marble/geodata/data/GeoDataLinearRing.h2
-rw-r--r--src/plugins/render/measure/MeasureToolPlugin.cpp2
-rw-r--r--src/plugins/runner/osm/OsmWay.cpp2
-rw-r--r--tools/osm-addresses/OsmParser.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/marble/geodata/data/GeoDataLinearRing.h b/src/lib/marble/geodata/data/GeoDataLinearRing.h
index 23b908e..df08c02 100644
--- a/src/lib/marble/geodata/data/GeoDataLinearRing.h
+++ b/src/lib/marble/geodata/data/GeoDataLinearRing.h
@@ -78,7 +78,7 @@ class GEODATA_EXPORT GeoDataLinearRing : public GeoDataLineString
/*!
\brief Creates a LinearRing from an existing geometry object.
*/
- GeoDataLinearRing( const GeoDataGeometry &other );
+ explicit GeoDataLinearRing(const GeoDataGeometry &other);
/*!
diff --git a/src/plugins/render/measure/MeasureToolPlugin.cpp b/src/plugins/render/measure/MeasureToolPlugin.cpp
index 1ad77c3..b18b761 100644
--- a/src/plugins/render/measure/MeasureToolPlugin.cpp
+++ b/src/plugins/render/measure/MeasureToolPlugin.cpp
@@ -420,7 +420,7 @@ void MeasureToolPlugin::drawSegments( GeoPainter* painter )
}
if (m_paintMode == Polygon && m_measureLineString.size() > 2) {
- GeoDataLinearRing measureRing = m_measureLineString;
+ GeoDataLinearRing measureRing(m_measureLineString);
if (m_showPolygonArea || m_showPerimeter) {
painter->setPen( Qt::NoPen );
diff --git a/src/plugins/runner/osm/OsmWay.cpp b/src/plugins/runner/osm/OsmWay.cpp
index 7358809..37ba831 100644
--- a/src/plugins/runner/osm/OsmWay.cpp
+++ b/src/plugins/runner/osm/OsmWay.cpp
@@ -56,7 +56,7 @@ void OsmWay::create(GeoDataDocument *document, const OsmNodes &nodes) const
linearRing->append(node.coordinates());
}
- *linearRing = linearRing->optimized();
+ *linearRing = GeoDataLinearRing(linearRing->optimized());
} else {
GeoDataLineString* lineString = new GeoDataLineString;
placemark->setGeometry(lineString);
diff --git a/tools/osm-addresses/OsmParser.cpp b/tools/osm-addresses/OsmParser.cpp
index 4578541..10ef246 100644
--- a/tools/osm-addresses/OsmParser.cpp
+++ b/tools/osm-addresses/OsmParser.cpp
@@ -478,12 +478,12 @@ void OsmParser::importMultipolygon( const Relation &relation )
}
GeoDataPolygon polygon;
- polygon.setOuterBoundary( string );
+ polygon.setOuterBoundary(GeoDataLinearRing(string));
Q_ASSERT( polygon.outerBoundary().size() > 0 );
foreach( const GeoDataLineString & hole, inner ) {
if ( contains<GeoDataLinearRing, GeoDataLineString>( polygon.outerBoundary(), hole ) ) {
- polygon.appendInnerBoundary( hole );
+ polygon.appendInnerBoundary(GeoDataLinearRing(hole));
}
}