summaryrefslogtreecommitdiff
path: root/src/imports
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2012-11-30 14:15:36 +0100
committerSamuel Rødal <samuel.rodal@digia.com>2012-11-30 14:35:44 +0100
commit1e8989fcb10f04daf5ec1c21d36e829dfbde62ec (patch)
tree39524a5a5affca68d2dd637d4b768482906fdc19 /src/imports
parent33dba5ada21adfabe55fa2698106921920ab7e3a (diff)
downloadqtlocation-1e8989fcb10f04daf5ec1c21d36e829dfbde62ec.tar.gz
Change usage of deprecated QWindow accessors
Required due to https://codereview.qt-project.org/#change,41252 Change-Id: I7f6da46cd5e8f43579ac7687412b76f0d6b0f343 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/location/qdeclarativegeomap.cpp4
-rw-r--r--src/imports/location/qdeclarativegeomapitembase.cpp2
-rw-r--r--src/imports/location/qdeclarativegeomapquickitem.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index 66206500..ce51a52b 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -1087,8 +1087,8 @@ void QDeclarativeGeoMap::fitViewportToMapItemsRefine(bool refine)
bottomRightX = centerPt.x() + circleItem->width() / 2.0;
bottomRightY = centerPt.y() + circleItem->height() / 2.0;
} else if (item) {
- topLeftX = item->pos().x();
- topLeftY = item->pos().y();
+ topLeftX = item->position().x();
+ topLeftY = item->position().y();
bottomRightX = topLeftX + item->width();
bottomRightY = topLeftY + item->height();
++itemCount;
diff --git a/src/imports/location/qdeclarativegeomapitembase.cpp b/src/imports/location/qdeclarativegeomapitembase.cpp
index e4ff3f21..aad9c0e1 100644
--- a/src/imports/location/qdeclarativegeomapitembase.cpp
+++ b/src/imports/location/qdeclarativegeomapitembase.cpp
@@ -196,7 +196,7 @@ void QDeclarativeGeoMapItemBase::setPositionOnMap(const QGeoCoordinate &coordina
QPointF topLeft = map_->coordinateToScreenPosition(coordinate, false) - offset;
- setPos(topLeft);
+ setPosition(topLeft);
}
/*!
diff --git a/src/imports/location/qdeclarativegeomapquickitem.cpp b/src/imports/location/qdeclarativegeomapquickitem.cpp
index 49cf5e7a..2def49c4 100644
--- a/src/imports/location/qdeclarativegeomapquickitem.cpp
+++ b/src/imports/location/qdeclarativegeomapquickitem.cpp
@@ -363,7 +363,7 @@ void QDeclarativeGeoMapQuickItem::updateMapItem()
opacityContainer_->setOpacity(zoomLevelOpacity());
sourceItem_.data()->setScale(scaleFactor());
- sourceItem_.data()->setPos(QPointF(0,0));
+ sourceItem_.data()->setPosition(QPointF(0,0));
setWidth(sourceItem_.data()->width());
setHeight(sourceItem_.data()->height());
setPositionOnMap(coordinate(), scaleFactor() * anchorPoint_);