diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
| commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
| tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /examples/widgets/graphicsview/diagramscene/diagramscene.cpp | |
| parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
| parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'examples/widgets/graphicsview/diagramscene/diagramscene.cpp')
| -rw-r--r-- | examples/widgets/graphicsview/diagramscene/diagramscene.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.cpp b/examples/widgets/graphicsview/diagramscene/diagramscene.cpp index 40272834c3..d0688d8552 100644 --- a/examples/widgets/graphicsview/diagramscene/diagramscene.cpp +++ b/examples/widgets/graphicsview/diagramscene/diagramscene.cpp @@ -51,8 +51,8 @@ #include "diagramscene.h" #include "arrow.h" -#include <QTextCursor> #include <QGraphicsSceneMouseEvent> +#include <QTextCursor> //! [0] DiagramScene::DiagramScene(QMenu *itemMenu, QObject *parent) @@ -61,8 +61,8 @@ DiagramScene::DiagramScene(QMenu *itemMenu, QObject *parent) myItemMenu = itemMenu; myMode = MoveItem; myItemType = DiagramItem::Step; - line = 0; - textItem = 0; + line = nullptr; + textItem = nullptr; myItemColor = Qt::white; myTextColor = Qt::black; myLineColor = Qt::black; @@ -188,7 +188,7 @@ void DiagramScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent) //! [10] void DiagramScene::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent) { - if (myMode == InsertLine && line != 0) { + if (myMode == InsertLine && line != nullptr) { QLineF newLine(line->line().p1(), mouseEvent->scenePos()); line->setLine(newLine); } else if (myMode == MoveItem) { @@ -200,7 +200,7 @@ void DiagramScene::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent) //! [11] void DiagramScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent) { - if (line != 0 && myMode == InsertLine) { + if (line != nullptr && myMode == InsertLine) { QList<QGraphicsItem *> startItems = items(line->line().p1()); if (startItems.count() && startItems.first() == line) startItems.removeFirst(); @@ -228,7 +228,7 @@ void DiagramScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent) } } //! [12] //! [13] - line = 0; + line = nullptr; QGraphicsScene::mouseReleaseEvent(mouseEvent); } //! [13] |