summaryrefslogtreecommitdiffstats
path: root/examples/opengl/2dpainting/helper.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'examples/opengl/2dpainting/helper.cpp')
-rw-r--r--examples/opengl/2dpainting/helper.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/examples/opengl/2dpainting/helper.cpp b/examples/opengl/2dpainting/helper.cpp
index b412dc11dc..168df2aff3 100644
--- a/examples/opengl/2dpainting/helper.cpp
+++ b/examples/opengl/2dpainting/helper.cpp
@@ -38,9 +38,12 @@
**
****************************************************************************/
-#include <QtWidgets>
#include "helper.h"
+#include <QPainter>
+#include <QPaintEvent>
+#include <QWidget>
+
//! [0]
Helper::Helper()
{
@@ -70,14 +73,15 @@ void Helper::paint(QPainter *painter, QPaintEvent *event, int elapsed)
painter->setPen(circlePen);
painter->rotate(elapsed * 0.030);
- qreal r = elapsed/1000.0;
+ qreal r = elapsed / 1000.0;
int n = 30;
for (int i = 0; i < n; ++i) {
painter->rotate(30);
- qreal radius = 0 + 120.0*((i+r)/n);
- qreal circleRadius = 1 + ((i+r)/n)*20;
+ qreal factor = (i + r) / n;
+ qreal radius = 0 + 120.0 * factor;
+ qreal circleRadius = 1 + factor * 20;
painter->drawEllipse(QRectF(radius, -circleRadius,
- circleRadius*2, circleRadius*2));
+ circleRadius * 2, circleRadius * 2));
}
painter->restore();
//! [2]
@@ -85,6 +89,6 @@ void Helper::paint(QPainter *painter, QPaintEvent *event, int elapsed)
//! [3]
painter->setPen(textPen);
painter->setFont(textFont);
- painter->drawText(QRect(-50, -50, 100, 100), Qt::AlignCenter, "Qt");
+ painter->drawText(QRect(-50, -50, 100, 100), Qt::AlignCenter, QStringLiteral("Qt"));
}
//! [3]