diff options
| author | Michael Winkelmann <Michael.winkelmann@qt.io> | 2017-07-14 16:09:10 +0200 |
|---|---|---|
| committer | Michael Winkelmann <Michael.winkelmann@qt.io> | 2017-07-18 15:34:28 +0000 |
| commit | cbcd1b0c432089777377fb0190a7d86195367bb6 (patch) | |
| tree | 75b13d9f19d2cbf6592f3d028b4bc99eb76cb753 /examples/scxml/trafficlight-common/trafficlight.h | |
| parent | 38eb39a8873f4341cff7165655bb6e2aed40a793 (diff) | |
Update examples to C++11
Change-Id: If23693387da9e5c0a102041298f626a068b26f6d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'examples/scxml/trafficlight-common/trafficlight.h')
| -rw-r--r-- | examples/scxml/trafficlight-common/trafficlight.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/scxml/trafficlight-common/trafficlight.h b/examples/scxml/trafficlight-common/trafficlight.h index f64feda..2639cb7 100644 --- a/examples/scxml/trafficlight-common/trafficlight.h +++ b/examples/scxml/trafficlight-common/trafficlight.h @@ -61,7 +61,7 @@ class TrafficLight : public QWidget Q_OBJECT public: - TrafficLight(QScxmlStateMachine *machine, QWidget *parent = 0); + TrafficLight(QScxmlStateMachine *machine, QWidget *parent = nullptr); private slots: void toggleWorking(bool pause); @@ -76,7 +76,7 @@ class LightWidget: public QWidget Q_PROPERTY(bool on READ isOn WRITE setOn) public: - LightWidget(const QString &image, QWidget *parent = 0); + LightWidget(const QString &image, QWidget *parent = nullptr); bool isOn() const; void setOn(bool on); @@ -85,23 +85,23 @@ public slots: void switchLight(bool onoff); protected: - virtual void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - virtual QSize sizeHint() const Q_DECL_OVERRIDE; + virtual void paintEvent(QPaintEvent *) override; + virtual QSize sizeHint() const override; private: QImage m_image; - bool m_on; + bool m_on = false; }; class ButtonWidget : public QAbstractButton { Q_OBJECT public: - ButtonWidget(QWidget *parent = 0); + ButtonWidget(QWidget *parent = nullptr); protected: - virtual void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - virtual QSize sizeHint() const Q_DECL_OVERRIDE; + virtual void paintEvent(QPaintEvent *) override; + virtual QSize sizeHint() const override; private: QImage m_playIcon; |