feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Rename member

Browse Source 
Change-Id: Ia4f249b39b14dc18def62f4d275e3fd1f9f2b0bc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2020-04-24 19:52:32 +02:00
parent a0385503d5
commit 18dfb7d42b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/components/formeditor/transitiontool.cpp
View File

@@ -229,7 +229,7 @@ void TransitionTool::clear()
void TransitionTool::mousePressEvent(const QList<QGraphicsItem*> &itemList, void TransitionTool::mousePressEvent(const QList<QGraphicsItem*> &itemList,
QGraphicsSceneMouseEvent *event) QGraphicsSceneMouseEvent *event)
{ {
if (m_block) if (m_blockEvents)
return; return;
if (event->button() != Qt::LeftButton) if (event->button() != Qt::LeftButton)
@@ -291,7 +291,7 @@ void TransitionTool::dragMoveEvent(const QList<QGraphicsItem*> &/*itemList*/, Q
void TransitionTool::mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, void TransitionTool::mouseReleaseEvent(const QList<QGraphicsItem*> &itemList,
QGraphicsSceneMouseEvent *event) QGraphicsSceneMouseEvent *event)
{ {
if (m_block) if (m_blockEvents)
return; return;
if (event->button() == Qt::LeftButton) { if (event->button() == Qt::LeftButton) {
@@ -362,7 +362,7 @@ void TransitionTool::activateTool()
void TransitionTool::unblock() void TransitionTool::unblock()
{ {
m_block = false; m_blockEvents = false;
} }
QGraphicsLineItem *TransitionTool::lineItem() QGraphicsLineItem *TransitionTool::lineItem()
@@ -389,7 +389,7 @@ FormEditorItem *TransitionTool::currentFormEditorItem() const
} }
void TransitionTool::createItems() { void TransitionTool::createItems() {
m_block = true; m_blockEvents = true;
QTimer::singleShot(200, this, [this](){ unblock(); }); QTimer::singleShot(200, this, [this](){ unblock(); });
if (!lineItem()) if (!lineItem())

2
src/plugins/qmldesigner/components/formeditor/transitiontool.h
View File

@@ -92,7 +92,7 @@ private:
std::unique_ptr<QGraphicsLineItem> m_lineItem; std::unique_ptr<QGraphicsLineItem> m_lineItem;
std::unique_ptr<QGraphicsRectItem> m_rectangleItem1; std::unique_ptr<QGraphicsRectItem> m_rectangleItem1;
std::unique_ptr<QGraphicsRectItem> m_rectangleItem2; std::unique_ptr<QGraphicsRectItem> m_rectangleItem2;
bool m_block = true; bool m_blockEvents = true;
}; };
} //QmlDesigner } //QmlDesigner