summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Rahn <rahn@kde.org>2016-11-10 17:16:24 (GMT)
committerTorsten Rahn <trahn@testo.de>2016-11-10 18:55:49 (GMT)
commit73dcb3cb8cfc3bb2341aa7fc57178866b7ff0036 (patch)
treeb5e229724a2e9d2ebc5353fca2e0d09788e04fa4
parent80c3aa76823727b1a48307064889830b2a85fb59 (diff)
Remove superfluous parameter.
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp18
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h6
2 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp
index 8602a69..fed9c3f 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp
+++ b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp
@@ -132,17 +132,17 @@ void GeoLineStringGraphicsItem::paint(GeoPainter* painter, const ViewportParams*
return;
}
if (painter->mapQuality() == HighQuality || painter->mapQuality() == PrintQuality) {
- paintOutline(painter, viewport, m_cachedPolygons);
+ paintOutline(painter, viewport);
}
} else if (layer.endsWith(QLatin1String("/inline"))) {
if (m_cachedPolygons.empty()) {
return;
}
- paintInline(painter, viewport, m_cachedPolygons);
+ paintInline(painter, viewport);
} else if (layer.endsWith(QLatin1String("/label"))) {
if (!m_cachedPolygons.empty()) {
if (m_renderLabel) {
- paintLabel(painter, viewport, m_cachedPolygons);
+ paintLabel(painter, viewport);
}
}
qDeleteAll(m_cachedPolygons);
@@ -162,7 +162,7 @@ void GeoLineStringGraphicsItem::paint(GeoPainter* painter, const ViewportParams*
}
}
-void GeoLineStringGraphicsItem::paintInline(GeoPainter* painter, const ViewportParams* viewport, const QVector<QPolygonF*> &polygons)
+void GeoLineStringGraphicsItem::paintInline(GeoPainter* painter, const ViewportParams* viewport)
{
if ( ( !viewport->resolves( m_renderLineString->latLonAltBox(), 2) ) ) {
return;
@@ -182,14 +182,14 @@ void GeoLineStringGraphicsItem::paintInline(GeoPainter* painter, const ViewportP
currentPen.setColor(style->polyStyle().paintedColor());
painter->setPen( currentPen );
}
- foreach(const QPolygonF* itPolygon, polygons) {
+ foreach(const QPolygonF* itPolygon, m_cachedPolygons) {
painter->drawPolyline(*itPolygon);
}
painter->restore();
}
-void GeoLineStringGraphicsItem::paintOutline(GeoPainter *painter, const ViewportParams *viewport, const QVector<QPolygonF*> &polygons)
+void GeoLineStringGraphicsItem::paintOutline(GeoPainter *painter, const ViewportParams *viewport)
{
if ( ( !viewport->resolves( m_renderLineString->latLonAltBox(), 2) ) ) {
return;
@@ -201,14 +201,14 @@ void GeoLineStringGraphicsItem::paintOutline(GeoPainter *painter, const Viewport
m_renderLabel = !( currentPen.widthF() < 8.0f );
if (!( currentPen.widthF() < 2.5f )) {
- foreach(const QPolygonF* itPolygon, polygons) {
+ foreach(const QPolygonF* itPolygon, m_cachedPolygons) {
painter->drawPolyline(*itPolygon);
}
}
painter->restore();
}
-void GeoLineStringGraphicsItem::paintLabel(GeoPainter *painter, const ViewportParams *viewport, const QVector<QPolygonF*> &polygons)
+void GeoLineStringGraphicsItem::paintLabel(GeoPainter *painter, const ViewportParams *viewport)
{
if ( ( !viewport->resolves( m_renderLineString->latLonAltBox(), 2) ) ) {
return;
@@ -228,7 +228,7 @@ void GeoLineStringGraphicsItem::paintLabel(GeoPainter *painter, const ViewportPa
//painter->setBackground(QBrush(color));
//painter->setBackgroundMode(Qt::OpaqueMode);
- painter->drawLabelsForPolygons(polygons, feature()->name(), FollowLine,
+ painter->drawLabelsForPolygons(m_cachedPolygons, feature()->name(), FollowLine,
labelStyle.paintedColor());
painter->restore();
diff --git a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h
index f1b74e3..97c6b9c 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h
+++ b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h
@@ -37,9 +37,9 @@ public:
void paint(GeoPainter* painter, const ViewportParams *viewport, const QString &layer);
private:
- void paintOutline(GeoPainter *painter, const ViewportParams *viewport, const QVector<QPolygonF*> &polygons);
- void paintInline(GeoPainter *painter, const ViewportParams *viewport, const QVector<QPolygonF*> &polygons);
- void paintLabel(GeoPainter *painter, const ViewportParams *viewport, const QVector<QPolygonF*> &polygons);
+ void paintOutline(GeoPainter *painter, const ViewportParams *viewport);
+ void paintInline(GeoPainter *painter, const ViewportParams *viewport);
+ void paintLabel(GeoPainter *painter, const ViewportParams *viewport);
QPen configurePainter(GeoPainter* painter, const ViewportParams *viewport, LabelPositionFlags &labelPositionFlags) const;
static bool canMerge(const GeoDataCoordinates &a, const GeoDataCoordinates &b);