summaryrefslogtreecommitdiff
path: root/src/location/labs/qsg
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2019-01-14 10:57:38 +0100
committerPaolo Angelelli <paolo.angelelli@qt.io>2019-01-14 14:33:57 +0000
commit1afc3744c33b67c29361e7300641c4e7212702fb (patch)
tree3b82a3bab97de67b4839a7fca898ed4c0c6c3d57 /src/location/labs/qsg
parent3ee61f7918cad8ff8ecc834b4fa85380c57afef6 (diff)
downloadqtlocation-1afc3744c33b67c29361e7300641c4e7212702fb.tar.gz
Rename MapIconObject.size to MapIconObject.iconSize
Associated signals and methods are also renamed Change-Id: I6a6baa77f8324d3b345118072be75491ca251be2 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/location/labs/qsg')
-rw-r--r--src/location/labs/qsg/qmapiconobjectqsg.cpp6
-rw-r--r--src/location/labs/qsg/qmapiconobjectqsg_p_p.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/location/labs/qsg/qmapiconobjectqsg.cpp b/src/location/labs/qsg/qmapiconobjectqsg.cpp
index 47c39695..1c621e5f 100644
--- a/src/location/labs/qsg/qmapiconobjectqsg.cpp
+++ b/src/location/labs/qsg/qmapiconobjectqsg.cpp
@@ -116,7 +116,7 @@ QSGNode *QMapIconObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode,
m_imageNode->setTexture(window->createTextureFromImage(m_image));
QRect rect = m_image.rect();
m_imageNode->setSourceRect(rect);
- m_imageNode->setRect(QRectF(QPointF(0,0), m_size));
+ m_imageNode->setRect(QRectF(QPointF(0,0), iconSize()));
}
if (m_geometryDirty) {
@@ -211,9 +211,9 @@ void QMapIconObjectPrivateQSG::setContent(const QVariant &content)
emit m_map->sgNodeChanged();
}
-void QMapIconObjectPrivateQSG::setSize(const QSizeF &size)
+void QMapIconObjectPrivateQSG::setIconSize(const QSizeF &size)
{
- QMapIconObjectPrivateDefault::setSize(size);
+ QMapIconObjectPrivateDefault::setIconSize(size);
updateGeometry();
}
diff --git a/src/location/labs/qsg/qmapiconobjectqsg_p_p.h b/src/location/labs/qsg/qmapiconobjectqsg_p_p.h
index c57828af..abc2fe9b 100644
--- a/src/location/labs/qsg/qmapiconobjectqsg_p_p.h
+++ b/src/location/labs/qsg/qmapiconobjectqsg_p_p.h
@@ -77,7 +77,7 @@ public:
// QGeoMapIconPrivate interface
void setCoordinate(const QGeoCoordinate &coordinate) override;
void setContent(const QVariant &content) override;
- void setSize(const QSizeF &size) override;
+ void setIconSize(const QSizeF &size) override;
// QGeoMapObjectPrivate
QGeoMapObjectPrivate *clone() override;