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.cpp | |
| 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.cpp')
| -rw-r--r-- | examples/scxml/trafficlight-common/trafficlight.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/examples/scxml/trafficlight-common/trafficlight.cpp b/examples/scxml/trafficlight-common/trafficlight.cpp index 66ed289..8792ae2 100644 --- a/examples/scxml/trafficlight-common/trafficlight.cpp +++ b/examples/scxml/trafficlight-common/trafficlight.cpp @@ -55,7 +55,7 @@ class TrafficLightWidget : public QWidget { public: - TrafficLightWidget(QWidget *parent = 0) + TrafficLightWidget(QWidget *parent = nullptr) : QWidget(parent), m_background(QLatin1String(":/background.png")) { QVBoxLayout *vbox = new QVBoxLayout(this); @@ -76,14 +76,14 @@ public: LightWidget *greenLight() const { return m_green; } - virtual void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE + virtual void paintEvent(QPaintEvent *) override { QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); painter.drawImage(0, 0, m_background); } - virtual QSize sizeHint() const Q_DECL_OVERRIDE + virtual QSize sizeHint() const override { return m_background.size(); } @@ -133,7 +133,6 @@ void TrafficLight::toggleWorking(bool pause) LightWidget::LightWidget(const QString &image, QWidget *parent) : QWidget(parent) , m_image(image) - , m_on(false) {} bool LightWidget::isOn() const |