diff options
author | Shawn Rutledge <shawn.rutledge@digia.com> | 2012-10-22 16:59:25 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 16:07:44 +0100 |
commit | 55f6a109e99ea2eb3359fa941a1826d4b4e11bf8 (patch) | |
tree | 35517eeb69916fed3e8e803cf4bd190125f538b6 /src/plugins/qmltooling | |
parent | 367cf77cd64f1b72496cde5484554ff7a8134f1d (diff) |
Renamed QQuickItem::pos property to position
Abbreviated property names are less descriptive so we don't have
many of them. Might as well be consistent. QWindow::pos was already
renamed.
Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/plugins/qmltooling')
-rw-r--r-- | src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp | 4 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp index d6fc0b27a5..b85987457e 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp @@ -113,13 +113,13 @@ void Highlight::adjust() QQuickWindow *view = m_item->window(); if (view->contentItem()) { scaleFactor = view->contentItem()->scale(); - originOffset -= view->contentItem()->pos(); + originOffset -= view->contentItem()->position(); } // The scale transform for the overlay needs to be cancelled // as the Item's transform which will be applied to the painter // takes care of it. parentItem()->setScale(1/scaleFactor); - setPos(originOffset); + setPosition(originOffset); update(); } diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp index 8cd40b4e0c..d05f4b9b59 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp @@ -67,7 +67,7 @@ InspectTool::InspectTool(QQuickViewInspector *inspector, QQuickView *view) : m_didPressAndHold(false), m_tapEvent(false), m_contentItem(view->contentItem()), - m_originalPosition(view->contentItem()->pos()), + m_originalPosition(view->contentItem()->position()), m_smoothScaleFactor(Constants::ZoomSnapDelta), m_minScale(0.125f), m_maxScale(48.0f), @@ -100,14 +100,14 @@ void InspectTool::enable(bool enable) // restoring the original states. if (m_contentItem) { m_contentItem->setScale(m_originalScale); - m_contentItem->setPos(m_originalPosition); + m_contentItem->setPosition(m_originalPosition); m_contentItem->setSmooth(m_originalSmooth); } } else { if (m_contentItem) { m_originalSmooth = m_contentItem->smooth(); m_originalScale = m_contentItem->scale(); - m_originalPosition = m_contentItem->pos(); + m_originalPosition = m_contentItem->position(); m_contentItem->setSmooth(true); } } @@ -288,9 +288,9 @@ void InspectTool::scaleView(const qreal &factor, const QPointF &newcenter, const return; } //New position = new center + scalefactor * (oldposition - oldcenter) - QPointF newPosition = newcenter + (factor * (m_contentItem->pos() - oldcenter)); + QPointF newPosition = newcenter + (factor * (m_contentItem->position() - oldcenter)); m_contentItem->setScale(m_contentItem->scale() * factor); - m_contentItem->setPos(newPosition); + m_contentItem->setPosition(newPosition); } void InspectTool::zoomIn() @@ -309,7 +309,7 @@ void InspectTool::zoomTo100() { m_didPressAndHold = true; - m_contentItem->setPos(QPointF(0, 0)); + m_contentItem->setPosition(QPointF(0, 0)); m_contentItem->setScale(1.0); } @@ -361,9 +361,9 @@ void InspectTool::initializeDrag(const QPointF &pos) void InspectTool::dragItemToPosition() { - QPointF newPosition = m_contentItem->pos() + m_mousePosition - m_dragStartPosition; + QPointF newPosition = m_contentItem->position() + m_mousePosition - m_dragStartPosition; m_dragStartPosition = m_mousePosition; - m_contentItem->setPos(newPosition); + m_contentItem->setPosition(newPosition); } void InspectTool::moveItem(bool valid) |