summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Beschow <[email protected]>2016-06-12 18:52:15 +0200
committerBernhard Beschow <[email protected]>2016-06-12 18:57:03 +0200
commit1a2c932ee29bb8e59b00df4f5323e9cd118fff4f (patch)
tree71fe6e376b641aa52eb53c4afb557bd3be4f73e8
parent9ff4092d1563e371f9c2b266ddf60a676a4e0d82 (diff)
make static
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp6
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp
index c458702..7bf522f 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp
+++ b/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp
@@ -160,7 +160,7 @@ void GeoPolygonGraphicsItem::initializeBuildingPainting(const GeoPainter* painte
}
}
-QPointF GeoPolygonGraphicsItem::centroid(const QPolygonF &polygon, double &area) const
+QPointF GeoPolygonGraphicsItem::centroid(const QPolygonF &polygon, double &area)
{
auto centroid = QPointF(0.0, 0.0);
area = 0.0;
@@ -518,8 +518,8 @@ void GeoPolygonGraphicsItem::paintFrame(GeoPainter *painter, const ViewportParam
painter->restore();
}
-void GeoPolygonGraphicsItem::screenPolygons(const ViewportParams *viewport, const GeoDataPolygon * polygon, QVector<QPolygonF*> & innerPolygons, QVector<QPolygonF*> & outlines) const {
-
+void GeoPolygonGraphicsItem::screenPolygons(const ViewportParams *viewport, const GeoDataPolygon *polygon, QVector<QPolygonF *> &innerPolygons, QVector<QPolygonF *> &outlines)
+{
Q_ASSERT(polygon);
QVector<QPolygonF*> outerPolygons;
diff --git a/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.h
index 798c2a9..34d1211 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.h
+++ b/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.h
@@ -51,14 +51,14 @@ private:
static double extractBuildingHeight(const GeoDataFeature *feature);
static QString extractBuildingLabel(const GeoDataFeature *feature);
static QList<NamedEntry> extractNamedEntries(const GeoDataFeature *feature);
- void screenPolygons(const ViewportParams *viewport, const GeoDataPolygon* polygon, QVector<QPolygonF*> &polygons, QVector<QPolygonF*> &outlines) const;
+ static void screenPolygons(const ViewportParams *viewport, const GeoDataPolygon* polygon, QVector<QPolygonF*> &polygons, QVector<QPolygonF*> &outlines);
QPen configurePainter(GeoPainter* painter, const ViewportParams *viewport, bool isBuildingFrame);
static bool isBuilding(GeoDataFeature::GeoDataVisualCategory visualCategory);
void initializeBuildingPainting(const GeoPainter* painter, const ViewportParams *viewport,
bool &drawAccurate3D, bool &isCameraAboveBuilding, bool &hasInnerBoundaries,
QVector<QPolygonF*>& outlinePolygons,
QVector<QPolygonF*>& innerPolygons) const;
- QPointF centroid(const QPolygonF &polygon, double &area) const;
+ static QPointF centroid(const QPolygonF &polygon, double &area);
const GeoDataPolygon *const m_polygon;
const GeoDataLinearRing *const m_ring;