Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I129dd579f92cb2592a38ca043472b45cb926ae12

3 files changed, 17 insertions, 17 deletions

diff --git a/examples/widgets/painting/gradients/gradients.cpp b/examples/widgets/painting/gradients/gradients.cpp
index a4528ce06f..d62ae93a15 100644
--- a/examples/widgets/painting/gradients/gradients.cpp
+++ b/examples/widgets/painting/gradients/gradients.cpp
@@ -102,9 +102,9 @@ uint ShadeWidget::colorAt(int x)
     generateShade();
 
     QPolygonF pts = m_hoverPoints->points();
-    for (int i=1; i < pts.size(); ++i) {
-        if (pts.at(i-1).x() <= x && pts.at(i).x() >= x) {
-            QLineF l(pts.at(i-1), pts.at(i));
+    for (int i = 1; i < pts.size(); ++i) {
+        if (pts.at(i - 1).x() <= x && pts.at(i).x() >= x) {
+            QLineF l(pts.at(i - 1), pts.at(i));
             l.setLength(l.length() * ((x - l.x1()) / l.dx()));
             return m_shade.pixel(qRound(qMin(l.x2(), (qreal(m_shade.width() - 1)))),
                                  qRound(qMin(l.y2(), qreal(m_shade.height() - 1))));
@@ -118,9 +118,9 @@ void ShadeWidget::setGradientStops(const QGradientStops &stops)
     if (m_shade_type == ARGBShade) {
         m_alpha_gradient = QLinearGradient(0, 0, width(), 0);
 
-        for (int i=0; i<stops.size(); ++i) {
-            QColor c = stops.at(i).second;
-            m_alpha_gradient.setColorAt(stops.at(i).first, QColor(c.red(), c.green(), c.blue()));
+        for (const auto &stop : stops) {
+            QColor c = stop.second;
+            m_alpha_gradient.setColorAt(stop.first, QColor(c.red(), c.green(), c.blue()));
         }
 
         m_shade = QImage();
@@ -223,13 +223,13 @@ void GradientEditor::pointsUpdated()
     std::sort(points.begin(), points.end(), x_less_than);
 
     for (int i = 0; i < points.size(); ++i) {
-        qreal x = int(points.at(i).x());
-        if (i + 1 < points.size() && x == points.at(i + 1).x())
+        const int x = int(points.at(i).x());
+        if (i + 1 < points.size() && x == int(points.at(i + 1).x()))
             continue;
-        QColor color((0x00ff0000 & m_red_shade->colorAt(int(x))) >> 16,
-                     (0x0000ff00 & m_green_shade->colorAt(int(x))) >> 8,
-                     (0x000000ff & m_blue_shade->colorAt(int(x))),
-                     (0xff000000 & m_alpha_shade->colorAt(int(x))) >> 24);
+        QColor color((0x00ff0000 & m_red_shade->colorAt(x)) >> 16,
+                     (0x0000ff00 & m_green_shade->colorAt(x)) >> 8,
+                     (0x000000ff & m_blue_shade->colorAt(x)),
+                     (0xff000000 & m_alpha_shade->colorAt(x)) >> 24);
 
         if (x / w > 1)
             return;
@@ -568,8 +568,8 @@ void GradientRenderer::paint(QPainter *p)
         g = QConicalGradient(pts.at(0), angle);
     }
 
-    for (int i = 0; i < m_stops.size(); ++i)
-        g.setColorAt(m_stops.at(i).first, m_stops.at(i).second);
+    for (const auto &stop : qAsConst(m_stops))
+        g.setColorAt(stop.first, stop.second);
 
     g.setSpread(m_spread);
 
diff --git a/examples/widgets/painting/gradients/gradients.h b/examples/widgets/painting/gradients/gradients.h
index c6525d18f8..45ef5d0f93 100644
--- a/examples/widgets/painting/gradients/gradients.h
+++ b/examples/widgets/painting/gradients/gradients.h
@@ -157,7 +157,7 @@ class GradientWidget : public QWidget
     Q_OBJECT
 
 public:
-    GradientWidget(QWidget *parent);
+    GradientWidget(QWidget *parent = nullptr);
 
 public slots:
     void setDefault1() { setDefault(1); }
diff --git a/examples/widgets/painting/gradients/main.cpp b/examples/widgets/painting/gradients/main.cpp
index 539d67e40e..0ddf7a4579 100644
--- a/examples/widgets/painting/gradients/main.cpp
+++ b/examples/widgets/painting/gradients/main.cpp
@@ -58,8 +58,8 @@ int main(int argc, char *argv[])
 
     QApplication app(argc, argv);
 
-    GradientWidget gradientWidget(0);
-    QStyle *arthurStyle = new ArthurStyle();
+    GradientWidget gradientWidget;
+    QStyle *arthurStyle = new ArthurStyle;
     gradientWidget.setStyle(arthurStyle);
     const QList<QWidget *> widgets = gradientWidget.findChildren<QWidget *>();
     for (QWidget *w : widgets) {