summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-21 03:02:57 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-21 05:30:24 (GMT)
commit50972f43c6fcca5d46a359ae971261d317b108c2 (patch)
tree2074bf4798f95b0335c38b7b523b3ec4d8fe2535
parentb84479c51ce875ca1be615a50d4afbad4defc491 (diff)
QList<NamedEntry> -> QVector<NamedEntry>
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp4
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp
index a6289ad..28051ac 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp
+++ b/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp
@@ -259,9 +259,9 @@ QString GeoPolygonGraphicsItem::extractBuildingLabel(const GeoDataFeature *featu
return QString();
}
-QList<GeoPolygonGraphicsItem::NamedEntry> GeoPolygonGraphicsItem::extractNamedEntries(const GeoDataFeature *feature)
+QVector<GeoPolygonGraphicsItem::NamedEntry> GeoPolygonGraphicsItem::extractNamedEntries(const GeoDataFeature *feature)
{
- QList<NamedEntry> entries;
+ QVector<NamedEntry> entries;
if (isBuilding(feature->visualCategory()) && feature->nodeType() == GeoDataTypes::GeoDataPlacemarkType) {
const GeoDataPlacemark *placemark = static_cast<const GeoDataPlacemark *>(feature);
diff --git a/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.h
index 34d1211..cf2c100 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.h
+++ b/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.h
@@ -50,7 +50,7 @@ private:
QPointF buildingOffset(const QPointF &point, const ViewportParams *viewport, bool* isCameraAboveBuilding=0) const;
static double extractBuildingHeight(const GeoDataFeature *feature);
static QString extractBuildingLabel(const GeoDataFeature *feature);
- static QList<NamedEntry> extractNamedEntries(const GeoDataFeature *feature);
+ static QVector<NamedEntry> extractNamedEntries(const GeoDataFeature *feature);
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);
@@ -68,7 +68,7 @@ private:
QColor m_cachedTextureColor;
QImage m_cachedTexture;
- QList<NamedEntry> m_entries;
+ const QVector<NamedEntry> m_entries;
};
}