From 0f5817998c4b3f581bb395c1fe958c6a1a47e575 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Wed, 31 Jul 2013 16:10:28 +0200
Subject: [PATCH] QmlDesigner: Rename scenePos in scenePosition

And change it to QPointF.

Change-Id: I24c6238eb2c415296b4621b7aa0ec06d85293cb7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
 .../components/componentcore/designeractionmanager.cpp    | 4 ++--
 .../components/componentcore/modelnodecontextmenu.cpp     | 2 +-
 .../components/componentcore/selectioncontext.cpp         | 4 ++--
 .../components/componentcore/selectioncontext.h           | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
index 53a20b5a13..a60ef2fd7b 100644
--- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
@@ -42,7 +42,7 @@ static inline QString captionForModelNode(const ModelNode &modelNode)
     return modelNode.id();
 }
 
-static inline bool contains(const QmlItemNode &node, const QPoint &position)
+static inline bool contains(const QmlItemNode &node, const QPointF &position)
 {
     return node.isValid() && node.instanceSceneTransform().mapRect(node.instanceBoundingRect()).contains(position);
 }
@@ -346,7 +346,7 @@ public:
             foreach (const ModelNode &node, m_selectionContext.view()->allModelNodes()) {
                 if (node != m_selectionContext.currentSingleSelectedNode()
                         && node != parentNode
-                        && contains(node, m_selectionContext.scenePos())
+                        && contains(node, m_selectionContext.scenePosition())
                         && !node.isRootNode()) {
                     m_selectionContext.setTargetNode(node);
                     QString what = QString(QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Select: %1")).arg(captionForModelNode(node));
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp
index 3af9adca2d..51b80734b1 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp
@@ -94,7 +94,7 @@ void ModelNodeContextMenu::execute(const QPoint &position, bool selectionMenuBoo
     QMenu* mainMenu = new QMenu();
 
     m_selectionContext.setShowSelectionTools(selectionMenuBool);
-    m_selectionContext.setScenePos(m_scenePos);
+    m_selectionContext.setScenePosition(m_scenePos);
 
 
      QSet<AbstractDesignerAction* > factories =
diff --git a/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp b/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp
index 71673a101b..5c01a69deb 100644
--- a/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp
@@ -101,12 +101,12 @@ bool SelectionContext::showSelectionTools() const
     return m_showSelectionTools;
 }
 
-void SelectionContext::setScenePos(const QPoint &postition)
+void SelectionContext::setScenePosition(const QPointF &postition)
 {
     m_scenePosition = postition;
 }
 
-QPoint SelectionContext::scenePos() const
+QPointF SelectionContext::scenePosition() const
 {
     return m_scenePosition;
 }
diff --git a/src/plugins/qmldesigner/components/componentcore/selectioncontext.h b/src/plugins/qmldesigner/components/componentcore/selectioncontext.h
index e2ad1b4152..e5a4705af4 100644
--- a/src/plugins/qmldesigner/components/componentcore/selectioncontext.h
+++ b/src/plugins/qmldesigner/components/componentcore/selectioncontext.h
@@ -29,7 +29,7 @@
 
 #include <qmldesignercorelib_global.h>
 #include <abstractview.h>
-#include <QPoint>
+#include <QPointF>
 
 #ifndef SELECTIONCONTEXT_H
 #define SELECTIONCONTEXT_H
@@ -58,8 +58,8 @@ public:
     void setShowSelectionTools(bool show);
     bool showSelectionTools() const;
 
-    void setScenePos(const QPoint &postition);
-    QPoint scenePos() const;
+    void setScenePosition(const QPointF &postition);
+    QPointF scenePosition() const;
 
     void setToggled(bool toggled);
     bool toggled() const;
@@ -70,7 +70,7 @@ private:
     QWeakPointer<AbstractView> m_view;
     ModelNode m_targetNode;
     bool m_showSelectionTools;
-    QPoint m_scenePosition;
+    QPointF m_scenePosition;
     bool m_toggled;
 };
 
-- 
GitLab