aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2020-04-24 19:52:32 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2020-04-27 13:27:53 +0000
commit18dfb7d42b5e6de3c33f2426d9d3e4f10c1902de (patch)
treeb418f20e1a67cd4223abb66d25a14683a054b324 /src/plugins/qmldesigner
parenta0385503d5cbc6f0565269ae5db20e07b9271429 (diff)
QmlDesigner: Rename member
Change-Id: Ia4f249b39b14dc18def62f4d275e3fd1f9f2b0bc Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner')
-rw-r--r--src/plugins/qmldesigner/components/formeditor/transitiontool.cpp8
-rw-r--r--src/plugins/qmldesigner/components/formeditor/transitiontool.h2
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 b1cee8c443..e8222e8ac8 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<QGraphicsItem*> &itemList,
QGraphicsSceneMouseEvent *event)
{
- if (m_block)
+ if (m_blockEvents)
return;
if (event->button() != Qt::LeftButton)
@@ -291,7 +291,7 @@ void TransitionTool::dragMoveEvent(const QList<QGraphicsItem*> &/*itemList*/, Q
void TransitionTool::mouseReleaseEvent(const QList<QGraphicsItem*> &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 6efa1d177a..43c3894933 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<QGraphicsLineItem> m_lineItem;
std::unique_ptr<QGraphicsRectItem> m_rectangleItem1;
std::unique_ptr<QGraphicsRectItem> m_rectangleItem2;
- bool m_block = true;
+ bool m_blockEvents = true;
};
} //QmlDesigner