From 18dfb7d42b5e6de3c33f2426d9d3e4f10c1902de Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 24 Apr 2020 19:52:32 +0200 Subject: [PATCH] QmlDesigner: Rename member Change-Id: Ia4f249b39b14dc18def62f4d275e3fd1f9f2b0bc Reviewed-by: Tim Jenssen --- .../qmldesigner/components/formeditor/transitiontool.cpp | 8 ++++---- .../qmldesigner/components/formeditor/transitiontool.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/transitiontool.cpp b/src/plugins/qmldesigner/components/formeditor/transitiontool.cpp index b1cee8c443b..e8222e8ac8a 100644 --- a/src/plugins/qmldesigner/components/formeditor/transitiontool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/transitiontool.cpp @@ -229,7 +229,7 @@ void TransitionTool::clear() void TransitionTool::mousePressEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) { - if (m_block) + if (m_blockEvents) return; if (event->button() != Qt::LeftButton) @@ -291,7 +291,7 @@ void TransitionTool::dragMoveEvent(const QList &/*itemList*/, Q void TransitionTool::mouseReleaseEvent(const QList &itemList, QGraphicsSceneMouseEvent *event) { - if (m_block) + if (m_blockEvents) return; if (event->button() == Qt::LeftButton) { @@ -362,7 +362,7 @@ void TransitionTool::activateTool() void TransitionTool::unblock() { - m_block = false; + m_blockEvents = false; } QGraphicsLineItem *TransitionTool::lineItem() @@ -389,7 +389,7 @@ FormEditorItem *TransitionTool::currentFormEditorItem() const } void TransitionTool::createItems() { - m_block = true; + m_blockEvents = true; QTimer::singleShot(200, this, [this](){ unblock(); }); if (!lineItem()) diff --git a/src/plugins/qmldesigner/components/formeditor/transitiontool.h b/src/plugins/qmldesigner/components/formeditor/transitiontool.h index 6efa1d177a1..43c3894933e 100644 --- a/src/plugins/qmldesigner/components/formeditor/transitiontool.h +++ b/src/plugins/qmldesigner/components/formeditor/transitiontool.h @@ -92,7 +92,7 @@ private: std::unique_ptr m_lineItem; std::unique_ptr m_rectangleItem1; std::unique_ptr m_rectangleItem2; - bool m_block = true; + bool m_blockEvents = true; }; } //QmlDesigner