From 055a34babef90acfd848ee9350ace9d3bfcd866b Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Mon, 18 Mar 2013 14:21:15 +0100
Subject: [PATCH] QmlDesigner.FormEditor: Add set view function to tool
Change-Id: Ie9ba58aec446dabc22cbecf99b791cfefd4e3412
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit e114c911b717deb8e29d2589d5756ad96e632fd7)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
---
.../components/formeditor/abstractformeditortool.cpp | 5 +++++
.../components/formeditor/abstractformeditortool.h | 3 ++-
.../qmldesigner/components/formeditor/formeditorview.cpp | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
index 94ec91745c7..5480f18b76e 100644
--- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
@@ -56,6 +56,11 @@ FormEditorView* AbstractFormEditorTool::view() const
return m_view;
}
+void AbstractFormEditorTool::setView(FormEditorView *view)
+{
+ m_view = view;
+}
+
FormEditorScene* AbstractFormEditorTool::scene() const
{
return view()->scene();
diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h
index 05c1b460d4c..4fab136c49a 100644
--- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h
+++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h
@@ -44,7 +44,7 @@ class FormEditorView;
class QMLDESIGNERCORE_EXPORT AbstractFormEditorTool
{
-
+ friend class FormEditorView;
public:
AbstractFormEditorTool(FormEditorView* view);
@@ -100,6 +100,7 @@ protected:
virtual void showContextMenu(QGraphicsSceneMouseEvent *event);
FormEditorView *view() const;
+ void setView(FormEditorView *view);
FormEditorScene* scene() const;
private:
FormEditorView *m_view;
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
index afdfc20cc01..753daa8c9ae 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
@@ -438,6 +438,7 @@ void FormEditorView::changeToCustomTool(const ModelNode &modelNode)
void FormEditorView::registerTool(AbstractCustomTool *tool)
{
+ tool->setView(this);
m_customToolList.append(tool);
}
--
GitLab