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/widgets/wiggly | |
parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'examples/widgets/widgets/wiggly')
-rw-r--r-- | examples/widgets/widgets/wiggly/wigglywidget.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/examples/widgets/widgets/wiggly/wigglywidget.cpp b/examples/widgets/widgets/wiggly/wigglywidget.cpp index 0399fe9056..ab549ef07c 100644 --- a/examples/widgets/widgets/wiggly/wigglywidget.cpp +++ b/examples/widgets/widgets/wiggly/wigglywidget.cpp @@ -50,11 +50,13 @@ #include "wigglywidget.h" -#include <QtWidgets> +#include <QFontMetrics> +#include <QPainter> +#include <QTimerEvent> //! [0] WigglyWidget::WigglyWidget(QWidget *parent) - : QWidget(parent) + : QWidget(parent), step(0) { setBackgroundRole(QPalette::Midlight); setAutoFillBackground(true); @@ -63,7 +65,6 @@ WigglyWidget::WigglyWidget(QWidget *parent) newFont.setPointSize(newFont.pointSize() + 20); setFont(newFont); - step = 0; timer.start(60, this); } //! [0] @@ -72,7 +73,7 @@ WigglyWidget::WigglyWidget(QWidget *parent) void WigglyWidget::paintEvent(QPaintEvent * /* event */) //! [1] //! [2] { - static const int sineTable[16] = { + static constexpr int sineTable[16] = { 0, 38, 71, 92, 100, 92, 71, 38, 0, -38, -71, -92, -100, -92, -71, -38 }; |