Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf

1 files changed, 7 insertions, 10 deletions

diff --git a/examples/widgets/tools/undoframework/diagramscene.cpp b/examples/widgets/tools/undoframework/diagramscene.cpp
index 63aad97cb1..65909ab6cb 100644
--- a/examples/widgets/tools/undoframework/diagramscene.cpp
+++ b/examples/widgets/tools/undoframework/diagramscene.cpp
@@ -48,27 +48,24 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "diagramscene.h"
 #include "diagramitem.h"
 
+#include <QGraphicsSceneMouseEvent>
+
 DiagramScene::DiagramScene(QObject *parent)
     : QGraphicsScene(parent)
-{
-    movingItem = 0;
-}
+{}
 
 void DiagramScene::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     QPointF mousePos(event->buttonDownScenePos(Qt::LeftButton).x(),
                      event->buttonDownScenePos(Qt::LeftButton).y());
     const QList<QGraphicsItem *> itemList = items(mousePos);
-    movingItem = itemList.isEmpty() ? 0 : itemList.first();
+    movingItem = itemList.isEmpty() ? nullptr : itemList.first();
 
-    if (movingItem != 0 && event->button() == Qt::LeftButton) {
+    if (movingItem != nullptr && event->button() == Qt::LeftButton)
         oldPos = movingItem->pos();
-    }
 
     clearSelection();
     QGraphicsScene::mousePressEvent(event);
@@ -76,11 +73,11 @@ void DiagramScene::mousePressEvent(QGraphicsSceneMouseEvent *event)
 
 void DiagramScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
-    if (movingItem != 0 && event->button() == Qt::LeftButton) {
+    if (movingItem != nullptr && event->button() == Qt::LeftButton) {
         if (oldPos != movingItem->pos())
             emit itemMoved(qgraphicsitem_cast<DiagramItem *>(movingItem),
                            oldPos);
-        movingItem = 0;
+        movingItem = nullptr;
     }
     QGraphicsScene::mouseReleaseEvent(event);
 }