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

Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf

1 files changed, 5 insertions, 7 deletions

diff --git a/examples/widgets/graphicsview/diagramscene/arrow.cpp b/examples/widgets/graphicsview/diagramscene/arrow.cpp
index 525e0b3fbb..9b2472bb33 100644
--- a/examples/widgets/graphicsview/diagramscene/arrow.cpp
+++ b/examples/widgets/graphicsview/diagramscene/arrow.cpp
@@ -50,19 +50,17 @@
 
 
 #include "arrow.h"
+#include "diagramitem.h"
 
-#include <qmath.h>
-#include <QPen>
 #include <QPainter>
+#include <QPen>
+#include <QtMath>
 
 //! [0]
 Arrow::Arrow(DiagramItem *startItem, DiagramItem *endItem, QGraphicsItem *parent)
-    : QGraphicsLineItem(parent)
+    : QGraphicsLineItem(parent), myStartItem(startItem), myEndItem(endItem)
 {
-    myStartItem = startItem;
-    myEndItem = endItem;
     setFlag(QGraphicsItem::ItemIsSelectable, true);
-    myColor = Qt::black;
     setPen(QPen(myColor, 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
 }
 //! [0]
@@ -98,7 +96,7 @@ void Arrow::updatePosition()
 
 //! [4]
 void Arrow::paint(QPainter *painter, const QStyleOptionGraphicsItem *,
-          QWidget *)
+                  QWidget *)
 {
     if (myStartItem->collidesWithItem(myEndItem))
         return;