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

Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf

3 files changed, 20 insertions, 12 deletions

diff --git a/examples/widgets/statemachine/eventtransitions/main.cpp b/examples/widgets/statemachine/eventtransitions/main.cpp
index 2de8e5daa3..fe9518092f 100644
--- a/examples/widgets/statemachine/eventtransitions/main.cpp
+++ b/examples/widgets/statemachine/eventtransitions/main.cpp
@@ -48,13 +48,18 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QEventTransition>
+#include <QPushButton>
+#include <QStateMachine>
+#include <QVBoxLayout>
+#include <QWidget>
 
 //! [0]
 class Window : public QWidget
 {
 public:
-    Window(QWidget *parent = 0)
+    Window(QWidget *parent = nullptr)
         : QWidget(parent)
     {
         QPushButton *button = new QPushButton(this);
diff --git a/examples/widgets/statemachine/factorial/main.cpp b/examples/widgets/statemachine/factorial/main.cpp
index e9431596fe..e6cbdcae29 100644
--- a/examples/widgets/statemachine/factorial/main.cpp
+++ b/examples/widgets/statemachine/factorial/main.cpp
@@ -57,10 +57,7 @@ class Factorial : public QObject
     Q_PROPERTY(int x READ x WRITE setX)
     Q_PROPERTY(int fac READ fac WRITE setFac)
 public:
-    Factorial(QObject *parent = 0)
-        : QObject(parent), m_x(-1), m_fac(1)
-    {
-    }
+    using QObject::QObject;
 
     int x() const
     {
@@ -89,8 +86,8 @@ Q_SIGNALS:
     void xChanged(int value);
 
 private:
-    int m_x;
-    int m_fac;
+    int m_x = -1;
+    int m_fac = 1;
 };
 //! [0]
 
diff --git a/examples/widgets/statemachine/trafficlight/main.cpp b/examples/widgets/statemachine/trafficlight/main.cpp
index a12d2f10d1..dd8bddcb37 100644
--- a/examples/widgets/statemachine/trafficlight/main.cpp
+++ b/examples/widgets/statemachine/trafficlight/main.cpp
@@ -48,7 +48,13 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QFinalState>
+#include <QPainter>
+#include <QStateMachine>
+#include <QTimer>
+#include <QVBoxLayout>
+#include <QWidget>
 
 //! [0]
 class LightWidget : public QWidget
@@ -56,7 +62,7 @@ class LightWidget : public QWidget
     Q_OBJECT
     Q_PROPERTY(bool on READ isOn WRITE setOn)
 public:
-    LightWidget(const QColor &color, QWidget *parent = 0)
+    LightWidget(const QColor &color, QWidget *parent = nullptr)
         : QWidget(parent), m_color(color), m_on(false) {}
 
     bool isOn() const
@@ -94,7 +100,7 @@ private:
 class TrafficLightWidget : public QWidget
 {
 public:
-    TrafficLightWidget(QWidget *parent = 0)
+    TrafficLightWidget(QWidget *parent = nullptr)
         : QWidget(parent)
     {
         QVBoxLayout *vbox = new QVBoxLayout(this);
@@ -125,7 +131,7 @@ private:
 //! [1]
 
 //! [2]
-QState *createLightState(LightWidget *light, int duration, QState *parent = 0)
+QState *createLightState(LightWidget *light, int duration, QState *parent = nullptr)
 {
     QState *lightState = new QState(parent);
     QTimer *timer = new QTimer(lightState);