1 files changed, 37 insertions, 11 deletions
diff --git a/examples/widgetbinding/wigglywidget.cpp b/examples/widgetbinding/wigglywidget.cpp
index ab549ef07..6d865d190 100644
--- a/examples/widgetbinding/wigglywidget.cpp
+++ b/examples/widgetbinding/wigglywidget.cpp
@@ -56,7 +56,7 @@
 
 //! [0]
 WigglyWidget::WigglyWidget(QWidget *parent)
-    : QWidget(parent), step(0)
+    : QWidget(parent)
 {
     setBackgroundRole(QPalette::Midlight);
     setAutoFillBackground(true);
@@ -64,8 +64,6 @@ WigglyWidget::WigglyWidget(QWidget *parent)
     QFont newFont = font();
     newFont.setPointSize(newFont.pointSize() + 20);
     setFont(newFont);
-
-    timer.start(60, this);
 }
 //! [0]
 
@@ -73,12 +71,14 @@ WigglyWidget::WigglyWidget(QWidget *parent)
 void WigglyWidget::paintEvent(QPaintEvent * /* event */)
 //! [1] //! [2]
 {
+    if (m_text.isEmpty())
+        return;
     static constexpr int sineTable[16] = {
         0, 38, 71, 92, 100, 92, 71, 38, 0, -38, -71, -92, -100, -92, -71, -38
     };
 
     QFontMetrics metrics(font());
-    int x = (width() - metrics.horizontalAdvance(text)) / 2;
+    int x = (width() - metrics.horizontalAdvance(m_text)) / 2;
     int y = (height() + metrics.ascent() - metrics.descent()) / 2;
     QColor color;
 //! [2]
@@ -86,13 +86,14 @@ void WigglyWidget::paintEvent(QPaintEvent * /* event */)
 //! [3]
     QPainter painter(this);
 //! [3] //! [4]
-    for (int i = 0; i < text.size(); ++i) {
-        int index = (step + i) % 16;
+    for (int i = 0; i < m_text.size(); ++i) {
+        int index = (m_step + i) % 16;
         color.setHsv((15 - index) * 16, 255, 191);
         painter.setPen(color);
-        painter.drawText(x, y - ((sineTable[index] * metrics.height()) / 400),
-                         QString(text[i]));
-        x += metrics.horizontalAdvance(text[i]);
+        const QChar c = m_text.at(i);
+        const int dy = (sineTable[index] * metrics.height()) / 400;
+        painter.drawText(x, y - dy, c);
+        x += metrics.horizontalAdvance(c);
     }
 }
 //! [4]
@@ -101,11 +102,36 @@ void WigglyWidget::paintEvent(QPaintEvent * /* event */)
 void WigglyWidget::timerEvent(QTimerEvent *event)
 //! [5] //! [6]
 {
-    if (event->timerId() == timer.timerId()) {
-        ++step;
+    if (event->timerId() == m_timer.timerId()) {
+        ++m_step;
         update();
     } else {
         QWidget::timerEvent(event);
     }
 //! [6]
 }
+
+QString WigglyWidget::text() const
+{
+    return m_text;
+}
+
+void WigglyWidget::setText(const QString &newText)
+{
+    m_text = newText;
+}
+
+bool WigglyWidget::isRunning() const
+{
+    return m_timer.isActive();
+}
+
+void WigglyWidget::setRunning(bool r)
+{
+    if (r == isRunning())
+        return;
+    if (r)
+        m_timer.start(60, this);
+    else
+        m_timer.stop();
+}