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

QmlDesigner fix parentheses warning

Browse Source 
/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp:145:
warning: suggest parentheses around '&&' within '||' [-Wparentheses]
                 || selectedItemCursorInMovableArea(event->scenePos())
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 && !event->modifiers().testFlag(Qt::ControlModifier)
                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 && !event->modifiers().testFlag(Qt::ShiftModifier)) {
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change-Id: Iea6018d885b9bad13363a39e2aee0e6e229f93c4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Nikita Baryshnikov
2017-07-21 16:57:08 +03:00
committed by Tim Jenssen
parent e6fb1fea65
commit 5d362a4d76
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
View File

@@ -140,9 +140,9 @@ void SelectionTool::hoverMoveEvent(const QList<QGraphicsItem*> &itemList,
} }
if ((topSelectedItemIsMovable(itemList) && !view()->hasSingleSelectedModelNode()) if ((topSelectedItemIsMovable(itemList) && !view()->hasSingleSelectedModelNode())
|| selectedItemCursorInMovableArea(event->scenePos()) || (selectedItemCursorInMovableArea(event->scenePos())
&& !event->modifiers().testFlag(Qt::ControlModifier) && !event->modifiers().testFlag(Qt::ControlModifier)
&& !event->modifiers().testFlag(Qt::ShiftModifier)) { && !event->modifiers().testFlag(Qt::ShiftModifier))) {
view()->changeToMoveTool(); view()->changeToMoveTool();
return; return;
} }