summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-21 02:31:31 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-21 05:30:24 (GMT)
commit97664768ef88ef06c6e48056f7ca8b2e917c93c6 (patch)
tree766b3d136935ff25e20b728f0da6279019fba4bc
parent90621c451d55463d0b516f0340b3fabad8438008 (diff)
QList<QColor> -> QVector<QColor>
-rw-r--r--src/lib/marble/MarbleModel.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/scene/GeoSceneGeodata.cpp4
-rw-r--r--src/lib/marble/geodata/scene/GeoSceneGeodata.h6
4 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/marble/MarbleModel.cpp b/src/lib/marble/MarbleModel.cpp
index a7f1cf4..4e5f21c 100644
--- a/src/lib/marble/MarbleModel.cpp
+++ b/src/lib/marble/MarbleModel.cpp
@@ -821,7 +821,7 @@ void MarbleModelPrivate::assignFillColors( const QString &filePath ) {
QPen pen = data->pen();
QBrush brush = data->brush();
- QList<QColor> colors = data->colors();
+ const QVector<QColor> colors = data->colors();
GeoDataLineStyle lineStyle( pen.color() );
lineStyle.setPenStyle( pen.style() );
lineStyle.setWidth( pen.width() );
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp b/src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp
index f7ad9ce..bef5c1b 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp
@@ -68,7 +68,7 @@ GeoNode* DgmlBrushTagHandler::parse(GeoParser& parser) const
if ( !colorMap.isEmpty() ) {
const QStringList colorString = colorMap.split(',');
- QList<QColor> colorList;
+ QVector<QColor> colorList;
colorList.reserve(colorString.size());
foreach(const QString& colorName, colorString) {
colorList.append(QColor(colorName));
diff --git a/src/lib/marble/geodata/scene/GeoSceneGeodata.cpp b/src/lib/marble/geodata/scene/GeoSceneGeodata.cpp
index 44ccaa2..7ea4cdc 100644
--- a/src/lib/marble/geodata/scene/GeoSceneGeodata.cpp
+++ b/src/lib/marble/geodata/scene/GeoSceneGeodata.cpp
@@ -111,12 +111,12 @@ void GeoSceneGeodata::setRenderOrder( int renderOrder )
m_renderOrder = renderOrder;
}
-QList<QColor> GeoSceneGeodata::colors() const
+QVector<QColor> GeoSceneGeodata::colors() const
{
return m_colors;
}
-void GeoSceneGeodata::setColors( const QList<QColor> &colors )
+void GeoSceneGeodata::setColors(const QVector<QColor> &colors)
{
m_colors = colors;
}
diff --git a/src/lib/marble/geodata/scene/GeoSceneGeodata.h b/src/lib/marble/geodata/scene/GeoSceneGeodata.h
index c1736a2..b4bbd42 100644
--- a/src/lib/marble/geodata/scene/GeoSceneGeodata.h
+++ b/src/lib/marble/geodata/scene/GeoSceneGeodata.h
@@ -51,8 +51,8 @@ class GEODATA_EXPORT GeoSceneGeodata : public GeoSceneAbstractDataset
int renderOrder() const;
void setRenderOrder( int renderOrder );
- QList<QColor> colors() const;
- void setColors( const QList<QColor> &colors );
+ QVector<QColor> colors() const;
+ void setColors(const QVector<QColor> &colors);
private:
QString m_property;
@@ -62,7 +62,7 @@ class GEODATA_EXPORT GeoSceneGeodata : public GeoSceneAbstractDataset
QPen m_pen;
QBrush m_brush;
int m_renderOrder;
- QList<QColor> m_colors;
+ QVector<QColor> m_colors;
};
}